Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[karo-tx-linux.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2aab1308690fad0416457a6ccbd6638636d69310..86e4ad56b573df27779831e17dce835f67396836 100644 (file)
--- 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;