diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-23 22:44:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-23 22:44:58 -0400 |
commit | 6440be177f56e0b52dd81df82b78875d9a07d5f9 (patch) | |
tree | 52d8f98694a7b1e2bee2595e3d9613f6d75c7385 /net | |
parent | 49186b4a083655a4ebf54e94baf0736256b01b47 (diff) | |
parent | 099714934d80100624829f1e2961b9dccaef3280 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/mlme.c | 28 | ||||
-rw-r--r-- | net/mac80211/rx.c | 2 | ||||
-rw-r--r-- | net/mac80211/wme.c | 2 |
3 files changed, 27 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 6b75cb6c6300..a5e5c31c23ab 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2248,10 +2248,13 @@ static void ieee80211_rx_bss_put(struct net_device *dev, | |||
2248 | struct ieee80211_sta_bss *bss) | 2248 | struct ieee80211_sta_bss *bss) |
2249 | { | 2249 | { |
2250 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 2250 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
2251 | if (!atomic_dec_and_test(&bss->users)) | 2251 | |
2252 | local_bh_disable(); | ||
2253 | if (!atomic_dec_and_lock(&bss->users, &local->sta_bss_lock)) { | ||
2254 | local_bh_enable(); | ||
2252 | return; | 2255 | return; |
2256 | } | ||
2253 | 2257 | ||
2254 | spin_lock_bh(&local->sta_bss_lock); | ||
2255 | __ieee80211_rx_bss_hash_del(dev, bss); | 2258 | __ieee80211_rx_bss_hash_del(dev, bss); |
2256 | list_del(&bss->list); | 2259 | list_del(&bss->list); |
2257 | spin_unlock_bh(&local->sta_bss_lock); | 2260 | spin_unlock_bh(&local->sta_bss_lock); |
@@ -2709,7 +2712,26 @@ static void ieee80211_rx_bss_info(struct net_device *dev, | |||
2709 | bss->wmm_ie_len = elems.wmm_param_len + 2; | 2712 | bss->wmm_ie_len = elems.wmm_param_len + 2; |
2710 | } else | 2713 | } else |
2711 | bss->wmm_ie_len = 0; | 2714 | bss->wmm_ie_len = 0; |
2712 | } else if (!elems.wmm_param && bss->wmm_ie) { | 2715 | } else if (elems.wmm_info && |
2716 | (!bss->wmm_ie || bss->wmm_ie_len != elems.wmm_info_len || | ||
2717 | memcmp(bss->wmm_ie, elems.wmm_info, elems.wmm_info_len))) { | ||
2718 | /* As for certain AP's Fifth bit is not set in WMM IE in | ||
2719 | * beacon frames.So while parsing the beacon frame the | ||
2720 | * wmm_info structure is used instead of wmm_param. | ||
2721 | * wmm_info structure was never used to set bss->wmm_ie. | ||
2722 | * This code fixes this problem by copying the WME | ||
2723 | * information from wmm_info to bss->wmm_ie and enabling | ||
2724 | * n-band association. | ||
2725 | */ | ||
2726 | kfree(bss->wmm_ie); | ||
2727 | bss->wmm_ie = kmalloc(elems.wmm_info_len + 2, GFP_ATOMIC); | ||
2728 | if (bss->wmm_ie) { | ||
2729 | memcpy(bss->wmm_ie, elems.wmm_info - 2, | ||
2730 | elems.wmm_info_len + 2); | ||
2731 | bss->wmm_ie_len = elems.wmm_info_len + 2; | ||
2732 | } else | ||
2733 | bss->wmm_ie_len = 0; | ||
2734 | } else if (!elems.wmm_param && !elems.wmm_info && bss->wmm_ie) { | ||
2713 | kfree(bss->wmm_ie); | 2735 | kfree(bss->wmm_ie); |
2714 | bss->wmm_ie = NULL; | 2736 | bss->wmm_ie = NULL; |
2715 | bss->wmm_ie_len = 0; | 2737 | bss->wmm_ie_len = 0; |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 52e4554fdde7..02f436a86061 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -2170,7 +2170,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
2170 | struct ieee80211_supported_band *sband; | 2170 | struct ieee80211_supported_band *sband; |
2171 | 2171 | ||
2172 | if (status->band < 0 || | 2172 | if (status->band < 0 || |
2173 | status->band > IEEE80211_NUM_BANDS) { | 2173 | status->band >= IEEE80211_NUM_BANDS) { |
2174 | WARN_ON(1); | 2174 | WARN_ON(1); |
2175 | return; | 2175 | return; |
2176 | } | 2176 | } |
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 4e94e4026e78..64faa3dc488f 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
@@ -709,7 +709,7 @@ void ieee80211_requeue(struct ieee80211_local *local, int queue) | |||
709 | struct ieee80211_sched_data *q = qdisc_priv(root_qd); | 709 | struct ieee80211_sched_data *q = qdisc_priv(root_qd); |
710 | struct Qdisc *qdisc = q->queues[queue]; | 710 | struct Qdisc *qdisc = q->queues[queue]; |
711 | struct sk_buff *skb = NULL; | 711 | struct sk_buff *skb = NULL; |
712 | u32 len = qdisc->q.qlen; | 712 | u32 len; |
713 | 713 | ||
714 | if (!qdisc || !qdisc->dequeue) | 714 | if (!qdisc || !qdisc->dequeue) |
715 | return; | 715 | return; |