diff options
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 10 | ||||
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 6e109dfb43e7..c9aeefcd7612 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c @@ -489,7 +489,7 @@ static void ap_control_kickall(struct ap_data *ap) { struct list_head *ptr, *n; struct sta_info *sta; - + spin_lock_bh(&ap->sta_table_lock); for (ptr = ap->sta_list.next, n = ptr->next; ptr != &ap->sta_list; ptr = n, n = ptr->next) { @@ -1573,7 +1573,7 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb, u++; left--; ileft = *u; u++; left--; - + if (ileft > left || ileft == 0 || ileft > WLAN_SUPP_RATES_MAX) { txt = "SUPP_RATES len error"; @@ -2047,7 +2047,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb, u++; left--; ileft = *u; u++; left--; - + if (ileft > left || ileft == 0 || ileft > 8) { PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n"); return; @@ -2064,7 +2064,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb, u++; left--; ileft = *u; u++; left--; - + if (ileft > left || ileft != 1) { PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n"); return; @@ -2839,7 +2839,7 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb) sta->tx_since_last_failure = 0; sta->tx_consecutive_exc++; - + if (sta->tx_consecutive_exc >= WLAN_RATE_DECREASE_THRESHOLD && sta->tx_rate_idx > 0 && meta->rate <= sta->tx_rate) { /* use next lower rate */ diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index a5a6d6a966ee..a83ee5cf0394 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -644,13 +644,13 @@ static int prism2_config(dev_link_t *link) link->conf.ConfigIndex = cfg->index; PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X " "(default 0x%02X)\n", cfg->index, dflt.index); - + /* Does this card need audio output? */ if (cfg->flags & CISTPL_CFTABLE_AUDIO) { link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Status = CCSR_AUDIO_ENA; } - + /* Use power settings for Vcc and Vpp if present */ /* Note that the CIS values need to be rescaled */ if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index f892aa87b13e..cfe127a10850 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c @@ -335,7 +335,7 @@ static int hostap_set_rate(struct net_device *dev) hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES, local->tx_rate_control) || local->func->reset_port(dev)); - + if (ret) { printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates " "setting to 0x%x failed\n", |