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

Commit 529ba6e9 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up association better in suspend 



When suspending, bss_info_changed() is called to
disable beacons, but managed mode interfaces are
simply removed (bss_info_changed() is called with
"no change" only). This can lead to problems.

To fix this and copy the BSS configuration, clear
it during suspend and restore it on resume.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 61e8a48c

net/mac80211/ieee80211_i.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -783,6 +783,11 @@ struct ieee80211_sub_if_data { 
		struct dentry *default_mgmt_key;

		struct dentry *default_mgmt_key;

	} debugfs;

	} debugfs;

#endif

#endif



#ifdef CONFIG_PM

	struct ieee80211_bss_conf suspend_bss_conf;

#endif



	/* must be last, dynamically sized area in this! */

	/* must be last, dynamically sized area in this! */

	struct ieee80211_vif vif;

	struct ieee80211_vif vif;

};

};

net/mac80211/pm.c

+16 −3
Original line number Original line Diff line number Diff line
@@ -121,6 +121,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 




	/* remove all interfaces */

	/* remove all interfaces */

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

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

		u32 changed = BSS_CHANGED_BEACON_ENABLED;



		if (!ieee80211_sdata_running(sdata))

		if (!ieee80211_sdata_running(sdata))

			continue;

			continue;
@@ -129,14 +131,25 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
		case NL80211_IFTYPE_MONITOR:

		case NL80211_IFTYPE_MONITOR:

			/* skip these */

			/* skip these */

			continue;

			continue;

		case NL80211_IFTYPE_STATION:

			if (sdata->vif.bss_conf.assoc)

				changed = BSS_CHANGED_ASSOC |

					  BSS_CHANGED_BSSID |

					  BSS_CHANGED_IDLE;

			else

				changed = 0;

			/* fall through */

		default:

		default:

			ieee80211_quiesce(sdata);

			ieee80211_quiesce(sdata);

			break;

			break;

		}

		}





		/* disable beaconing */

		sdata->suspend_bss_conf = sdata->vif.bss_conf;

		ieee80211_bss_info_change_notify(sdata,

		memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf));

			BSS_CHANGED_BEACON_ENABLED);

		sdata->vif.bss_conf.idle = true;



		/* disable beaconing or remove association */

		ieee80211_bss_info_change_notify(sdata, changed);





		if (sdata->vif.type == NL80211_IFTYPE_AP &&

		if (sdata->vif.type == NL80211_IFTYPE_AP &&

		    rcu_access_pointer(sdata->u.ap.beacon))

		    rcu_access_pointer(sdata->u.ap.beacon))

net/mac80211/util.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1526,6 +1526,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
			  BSS_CHANGED_IDLE |

			  BSS_CHANGED_IDLE |

			  BSS_CHANGED_TXPOWER;

			  BSS_CHANGED_TXPOWER;





#ifdef CONFIG_PM

		if (local->resuming)

			sdata->vif.bss_conf = sdata->suspend_bss_conf;

#endif



		switch (sdata->vif.type) {

		switch (sdata->vif.type) {

		case NL80211_IFTYPE_STATION:

		case NL80211_IFTYPE_STATION:

			changed |= BSS_CHANGED_ASSOC |

			changed |= BSS_CHANGED_ASSOC |