Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
commit
cd80e107b7
|
@ -2861,14 +2861,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
|
||||||
ieee80211_rx_bss_put(local, bss);
|
ieee80211_rx_bss_put(local, bss);
|
||||||
sdata->vif.bss_conf.beacon_rate = bss->beacon_rate;
|
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_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,
|
if (ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
|
||||||
elems.wmm_param_len))
|
elems.wmm_param_len))
|
||||||
changed |= BSS_CHANGED_QOS;
|
changed |= BSS_CHANGED_QOS;
|
||||||
|
|
Loading…
Reference in New Issue