aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.c10
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c4
-rw-r--r--drivers/net/wireless/hostap/hostap_ioctl.c2
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 6e109dfb43e..c9aeefcd761 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)
489{ 489{
490 struct list_head *ptr, *n; 490 struct list_head *ptr, *n;
491 struct sta_info *sta; 491 struct sta_info *sta;
492 492
493 spin_lock_bh(&ap->sta_table_lock); 493 spin_lock_bh(&ap->sta_table_lock);
494 for (ptr = ap->sta_list.next, n = ptr->next; ptr != &ap->sta_list; 494 for (ptr = ap->sta_list.next, n = ptr->next; ptr != &ap->sta_list;
495 ptr = n, n = ptr->next) { 495 ptr = n, n = ptr->next) {
@@ -1573,7 +1573,7 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
1573 u++; left--; 1573 u++; left--;
1574 ileft = *u; 1574 ileft = *u;
1575 u++; left--; 1575 u++; left--;
1576 1576
1577 if (ileft > left || ileft == 0 || 1577 if (ileft > left || ileft == 0 ||
1578 ileft > WLAN_SUPP_RATES_MAX) { 1578 ileft > WLAN_SUPP_RATES_MAX) {
1579 txt = "SUPP_RATES len error"; 1579 txt = "SUPP_RATES len error";
@@ -2047,7 +2047,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb,
2047 u++; left--; 2047 u++; left--;
2048 ileft = *u; 2048 ileft = *u;
2049 u++; left--; 2049 u++; left--;
2050 2050
2051 if (ileft > left || ileft == 0 || ileft > 8) { 2051 if (ileft > left || ileft == 0 || ileft > 8) {
2052 PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n"); 2052 PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n");
2053 return; 2053 return;
@@ -2064,7 +2064,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb,
2064 u++; left--; 2064 u++; left--;
2065 ileft = *u; 2065 ileft = *u;
2066 u++; left--; 2066 u++; left--;
2067 2067
2068 if (ileft > left || ileft != 1) { 2068 if (ileft > left || ileft != 1) {
2069 PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n"); 2069 PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n");
2070 return; 2070 return;
@@ -2839,7 +2839,7 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
2839 2839
2840 sta->tx_since_last_failure = 0; 2840 sta->tx_since_last_failure = 0;
2841 sta->tx_consecutive_exc++; 2841 sta->tx_consecutive_exc++;
2842 2842
2843 if (sta->tx_consecutive_exc >= WLAN_RATE_DECREASE_THRESHOLD && 2843 if (sta->tx_consecutive_exc >= WLAN_RATE_DECREASE_THRESHOLD &&
2844 sta->tx_rate_idx > 0 && meta->rate <= sta->tx_rate) { 2844 sta->tx_rate_idx > 0 && meta->rate <= sta->tx_rate) {
2845 /* use next lower rate */ 2845 /* use next lower rate */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index a5a6d6a966e..a83ee5cf039 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)
644 link->conf.ConfigIndex = cfg->index; 644 link->conf.ConfigIndex = cfg->index;
645 PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X " 645 PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
646 "(default 0x%02X)\n", cfg->index, dflt.index); 646 "(default 0x%02X)\n", cfg->index, dflt.index);
647 647
648 /* Does this card need audio output? */ 648 /* Does this card need audio output? */
649 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 649 if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
650 link->conf.Attributes |= CONF_ENABLE_SPKR; 650 link->conf.Attributes |= CONF_ENABLE_SPKR;
651 link->conf.Status = CCSR_AUDIO_ENA; 651 link->conf.Status = CCSR_AUDIO_ENA;
652 } 652 }
653 653
654 /* Use power settings for Vcc and Vpp if present */ 654 /* Use power settings for Vcc and Vpp if present */
655 /* Note that the CIS values need to be rescaled */ 655 /* Note that the CIS values need to be rescaled */
656 if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { 656 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 f892aa87b13..cfe127a1085 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)
335 hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES, 335 hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,
336 local->tx_rate_control) || 336 local->tx_rate_control) ||
337 local->func->reset_port(dev)); 337 local->func->reset_port(dev));
338 338
339 if (ret) { 339 if (ret) {
340 printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates " 340 printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates "
341 "setting to 0x%x failed\n", 341 "setting to 0x%x failed\n",