diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 13:49:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 13:49:20 -0400 |
| commit | cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc (patch) | |
| tree | c5e95347439b75ba4bd67c566f42f7aaf7730403 /net/mac80211 | |
| parent | 53b2f828487ea7a3f6fa4007b629466fb0d14339 (diff) | |
| parent | d70b7616d9080ec9f868fbd31db5fd4341435d61 (diff) | |
| download | linux-cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc.tar.bz2 | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2aab1308690f..86e4ad56b573 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2861,14 +2861,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ieee80211_rx_bss_put(local, bss); sdata->vif.bss_conf.beacon_rate = bss->beacon_rate; } - - if (!sdata->u.mgd.associated || - !ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) - return; - - ieee80211_sta_process_chanswitch(sdata, rx_status->mactime, - elems, true); - } @@ -3157,6 +3149,9 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems); + ieee80211_sta_process_chanswitch(sdata, rx_status->mactime, + &elems, true); + if (ieee80211_sta_wmm_params(local, sdata, elems.wmm_param, elems.wmm_param_len)) changed |= BSS_CHANGED_QOS; |