mac80211: Add validity check for beacon_crc value (d8ec4433) · Commits · 戴 / test

On association to an AP, after receiving beacons, the beacon_crc value is set. The beacon_crc value is not reset in disassociation, but the BSS data may be expired at a later point. When associating again, it's possible that a beacon for the AP is not received, resulting in the beacon_ies to remain NULL. After association, further beacons will not update the beacon data, as the crc value of the beacon has not changed, and the beacon_crc still holds a value matching the beacon. The beacon_ies will remain forever null. One of the results of this is that WLAN power save cannot be entered, the STA will remain foreven in active mode. Fix this by adding a validation flag for the beacon_crc, which is cleared on association. Signed-off-by:

Juuso Oikarinen <juuso.oikarinen@nokia.com> Acked-by:

Johannes Berg <johannes@sipsolutions.net> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

net/mac80211/ieee80211_i.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,7 @@ struct ieee80211_if_managed {

		unsigned int flags;

		bool beacon_crc_valid;
		u32 beacon_crc;

		enum {

net/mac80211/mlme.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1639,7 +1639,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
		directed_tim = ieee80211_check_tim(elems.tim, elems.tim_len,
		ifmgd->aid);

		if (ncrc != ifmgd->beacon_crc) {
		if (ncrc != ifmgd->beacon_crc \|\| !ifmgd->beacon_crc_valid) {
		ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
		true);

		@@ -1670,9 +1670,10 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
		}
		}

		if (ncrc == ifmgd->beacon_crc)
		if (ncrc == ifmgd->beacon_crc && ifmgd->beacon_crc_valid)
		return;
		ifmgd->beacon_crc = ncrc;
		ifmgd->beacon_crc_valid = true;

		if (elems.erp_info && elems.erp_info_len >= 1) {
		erp_valid = true;
		@@ -2214,6 +2215,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
		ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N;
		ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;

		ifmgd->beacon_crc_valid = false;

		for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
		if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 \|\|
		req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP \|\|

Admin message