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

Commit 3c3e21e7 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: destroy virtual monitor interface across suspend 



It has to be removed from the driver, but completely
destroying it helps handle unplug of a device during
suspend since then the channel context handling etc.
doesn't have to happen later when it's removed.

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

net/mac80211/ieee80211_i.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1336,6 +1336,8 @@ void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata, 
				    const int offset);

				    const int offset);

int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up);

int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up);

void ieee80211_sdata_stop(struct ieee80211_sub_if_data *sdata);

void ieee80211_sdata_stop(struct ieee80211_sub_if_data *sdata);

int ieee80211_add_virtual_monitor(struct ieee80211_local *local);

void ieee80211_del_virtual_monitor(struct ieee80211_local *local);





bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);

bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);

void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);

void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);

net/mac80211/iface.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ static void ieee80211_set_default_queues(struct ieee80211_sub_if_data *sdata) 
	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;

	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;

}

}





static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)

int ieee80211_add_virtual_monitor(struct ieee80211_local *local)

{

{

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_sub_if_data *sdata;

	int ret = 0;

	int ret = 0;
@@ -400,7 +400,7 @@ static int ieee80211_add_virtual_monitor(struct ieee80211_local *local) 
	return ret;

	return ret;

}

}





static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)

void ieee80211_del_virtual_monitor(struct ieee80211_local *local)

{

{

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_sub_if_data *sdata;

net/mac80211/pm.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 




	ieee80211_roc_purge(local, NULL);

	ieee80211_roc_purge(local, NULL);





	ieee80211_del_virtual_monitor(local);



	if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {

	if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {

		mutex_lock(&local->sta_mtx);

		mutex_lock(&local->sta_mtx);

		list_for_each_entry(sta, &local->sta_list, list) {

		list_for_each_entry(sta, &local->sta_list, list) {
@@ -103,10 +105,6 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
		drv_remove_interface(local, sdata);

		drv_remove_interface(local, sdata);

	}

	}





	sdata = rtnl_dereference(local->monitor_sdata);

	if (sdata)

		drv_remove_interface(local, sdata);



	/*

	/*

	 * We disconnected on all interfaces before suspend, all channel

	 * We disconnected on all interfaces before suspend, all channel

	 * contexts should be released.

	 * contexts should be released.

net/mac80211/util.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1461,6 +1461,8 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
	/* add interfaces */

	/* add interfaces */

	sdata = rtnl_dereference(local->monitor_sdata);

	sdata = rtnl_dereference(local->monitor_sdata);

	if (sdata) {

	if (sdata) {

		/* in HW restart it exists already */

		WARN_ON(local->resuming);

		res = drv_add_interface(local, sdata);

		res = drv_add_interface(local, sdata);

		if (WARN_ON(res)) {

		if (WARN_ON(res)) {

			rcu_assign_pointer(local->monitor_sdata, NULL);

			rcu_assign_pointer(local->monitor_sdata, NULL);
@@ -1650,6 +1652,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
	local->in_reconfig = false;

	local->in_reconfig = false;

	barrier();

	barrier();





	if (local->monitors == local->open_count && local->monitors > 0)

		ieee80211_add_virtual_monitor(local);



	/*

	/*

	 * Clear the WLAN_STA_BLOCK_BA flag so new aggregation

	 * Clear the WLAN_STA_BLOCK_BA flag so new aggregation

	 * sessions can be established after a resume.

	 * sessions can be established after a resume.