mac80211: fix resume from WoWLAN (d888130a) · Commits · 戴 / test

My commit ("mac80211: clean up association better in suspend") introduced a bug when resuming from WoWLAN when a device reset is desired. This case must not use the suspend_bss_conf as it hasn't been stored. Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/util.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1358,8 +1358,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
		struct ieee80211_chanctx *ctx;
		struct sta_info *sta;
		int res, i;

		#ifdef CONFIG_PM
		bool reconfig_due_to_wowlan = false;

		if (local->suspended)
		local->resuming = true;

		@@ -1377,6 +1378,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
		* res is 1, which means the driver requested
		* to go through a regular reset on wakeup.
		*/
		reconfig_due_to_wowlan = true;
		}
		#endif
		/* everything else happens only if HW was up & running */
		@@ -1527,7 +1529,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
		BSS_CHANGED_TXPOWER;

		#ifdef CONFIG_PM
		if (local->resuming)
		if (local->resuming && !reconfig_due_to_wowlan)
		sdata->vif.bss_conf = sdata->suspend_bss_conf;
		#endif

Admin message