Commit 062f1d6d authored Apr 22, 2014 by Chun-Yeow Yeoh Committed by Johannes Berg Apr 22, 2014

mac80211: avoid handling of SMPS for mesh



The patch "mac80211: implement SMPS for AP" has caused kernel
oops at mesh STA if the peer mesh STA operates in sleep mode
and then becomes active mode. It can be easily reproduced by
setting the following commands at peer mesh STA:

iw mesh0 station set aa:bb:cc:dd:ee:ff mesh_power_mode deep
iw mesh0 station set aa:bb:cc:dd:ee:ff mesh_power_mode active

Kernel oops will happen at mesh STA aa:bb:cc:dd:ee:ff.

Fix this by avoiding SMPS for mesh mode.

Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 764152ff

net/mac80211/sta_info.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1148,7 +1148,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
		atomic_dec(&ps->num_sta_ps);

		/* This station just woke up and isn't aware of our SMPS state */
		if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,
		if (!ieee80211_vif_is_mesh(&sdata->vif) &&
		!ieee80211_smps_is_restrictive(sta->known_smps_mode,
		sdata->smps_mode) &&
		sta->known_smps_mode != sdata->bss->req_smps &&
		sta_info_tx_streams(sta) != 1) {

Admin message