Commit ac2f7d6f authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: move monitor work to wiphy work 



Again this serves to simplify the locking in mac80211
in the future, since this is a relatively complex work.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 20171251

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ struct ieee80211_if_managed { 
	struct timer_list timer;

	struct timer_list conn_mon_timer;

	struct timer_list bcn_mon_timer;

	struct work_struct monitor_work;

	struct wiphy_work monitor_work;

	struct wiphy_work beacon_connection_loss_work;

	struct wiphy_work csa_connection_drop_work;

net/mac80211/mlme.c

+8 −6
Original line number Diff line number Diff line
@@ -6683,10 +6683,11 @@ static void ieee80211_sta_conn_mon_timer(struct timer_list *t) 
		return;

	}



	ieee80211_queue_work(&local->hw, &ifmgd->monitor_work);

	wiphy_work_queue(local->hw.wiphy, &sdata->u.mgd.monitor_work);

}



static void ieee80211_sta_monitor_work(struct work_struct *work)

static void ieee80211_sta_monitor_work(struct wiphy *wiphy,

				       struct wiphy_work *work)

{

	struct ieee80211_sub_if_data *sdata =

		container_of(work, struct ieee80211_sub_if_data,
@@ -6702,7 +6703,7 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) 


		/* let's probe the connection once */

		if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))

			ieee80211_queue_work(&sdata->local->hw,

			wiphy_work_queue(sdata->local->hw.wiphy,

					 &sdata->u.mgd.monitor_work);

	}

}
@@ -6821,7 +6822,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) 
{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	INIT_WORK(&ifmgd->monitor_work, ieee80211_sta_monitor_work);

	wiphy_work_init(&ifmgd->monitor_work, ieee80211_sta_monitor_work);

	wiphy_work_init(&ifmgd->beacon_connection_loss_work,

			ieee80211_beacon_connection_loss_work);

	wiphy_work_init(&ifmgd->csa_connection_drop_work,
@@ -7850,7 +7851,8 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata) 
	 * they will not do anything but might not have been

	 * cancelled when disconnecting.

	 */

	cancel_work_sync(&ifmgd->monitor_work);

	wiphy_work_cancel(sdata->local->hw.wiphy,

			  &ifmgd->monitor_work);

	wiphy_work_cancel(sdata->local->hw.wiphy,

			  &ifmgd->beacon_connection_loss_work);

	wiphy_work_cancel(sdata->local->hw.wiphy,