Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b21aea0 authored by Eyal Shapira's avatar Eyal Shapira Committed by John W. Linville
Browse files

mac80211: fix ADDBA declined after suspend with wowlan 



WLAN_STA_BLOCK_BA is set while suspending but doesn't get cleared
when resuming in case of wowlan. This causes further ADDBA requests
received to be rejected. Fix it by clearing it in the wowlan path
as well.

Signed-off-by: default avatarEyal Shapira <eyal@wizery.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4161923a

net/mac80211/util.c

+6 −6
Original line number Diff line number Diff line
@@ -1371,6 +1371,12 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		}

	}



	/* add back keys */

	list_for_each_entry(sdata, &local->interfaces, list)

		if (ieee80211_sdata_running(sdata))

			ieee80211_enable_keys(sdata);



 wake_up:

	/*

	 * Clear the WLAN_STA_BLOCK_BA flag so new aggregation

	 * sessions can be established after a resume.
@@ -1392,12 +1398,6 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		mutex_unlock(&local->sta_mtx);

	}



	/* add back keys */

	list_for_each_entry(sdata, &local->interfaces, list)

		if (ieee80211_sdata_running(sdata))

			ieee80211_enable_keys(sdata);



 wake_up:

	ieee80211_wake_queues_by_reason(hw,

			IEEE80211_QUEUE_STOP_REASON_SUSPEND);