Commit 766d2601 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: move DFS CAC work to wiphy work 



Move the DFS CAC work over to hold the wiphy lock
there without worry about work cancellation.

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

net/mac80211/cfg.c

+5 −5
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, 


	if (sdata->wdev.cac_started) {

		chandef = link_conf->chandef;

		cancel_delayed_work_sync(&link->dfs_cac_timer_work);

		wiphy_delayed_work_cancel(wiphy, &link->dfs_cac_timer_work);

		cfg80211_cac_event(sdata->dev, &chandef,

				   NL80211_RADAR_CAC_ABORTED,

				   GFP_KERNEL);
@@ -3424,8 +3424,7 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy, 
	if (err)

		goto out_unlock;



	ieee80211_queue_delayed_work(&sdata->local->hw,

				     &sdata->deflink.dfs_cac_timer_work,

	wiphy_delayed_work_queue(wiphy, &sdata->deflink.dfs_cac_timer_work,

				 msecs_to_jiffies(cac_time_ms));



 out_unlock:
@@ -3445,7 +3444,8 @@ static void ieee80211_end_cac(struct wiphy *wiphy, 
		 * by the time it gets it, sdata->wdev.cac_started

		 * will no longer be true

		 */

		cancel_delayed_work(&sdata->deflink.dfs_cac_timer_work);

		wiphy_delayed_work_cancel(wiphy,

					  &sdata->deflink.dfs_cac_timer_work);



		if (sdata->wdev.cac_started) {

			ieee80211_link_release_channel(&sdata->deflink);

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ struct ieee80211_link_data { 
	int ap_power_level; /* in dBm */



	bool radar_required;

	struct delayed_work dfs_cac_timer_work;

	struct wiphy_delayed_work dfs_cac_timer_work;



	union {

		struct ieee80211_link_data_managed mgd;
@@ -2569,7 +2569,7 @@ void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, 
				      struct ieee80211_link_data *rsvd_for);

bool ieee80211_is_radar_required(struct ieee80211_local *local);



void ieee80211_dfs_cac_timer_work(struct work_struct *work);

void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work);

void ieee80211_dfs_cac_cancel(struct ieee80211_local *local);

void ieee80211_dfs_radar_detected_work(struct work_struct *work);

int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,

net/mac80211/iface.c

+2 −1
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do 
	cancel_work_sync(&sdata->deflink.csa_finalize_work);

	cancel_work_sync(&sdata->deflink.color_change_finalize_work);



	cancel_delayed_work_sync(&sdata->deflink.dfs_cac_timer_work);

	wiphy_delayed_work_cancel(local->hw.wiphy,

				  &sdata->deflink.dfs_cac_timer_work);



	if (sdata->wdev.cac_started) {

		chandef = sdata->vif.bss_conf.chandef;

net/mac80211/link.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void ieee80211_link_init(struct ieee80211_sub_if_data *sdata, 
			  ieee80211_color_collision_detection_work);

	INIT_LIST_HEAD(&link->assigned_chanctx_list);

	INIT_LIST_HEAD(&link->reserved_chanctx_list);

	INIT_DELAYED_WORK(&link->dfs_cac_timer_work,

	wiphy_delayed_work_init(&link->dfs_cac_timer_work,

				ieee80211_dfs_cac_timer_work);



	if (!deflink) {

net/mac80211/mlme.c

+3 −4
Original line number Diff line number Diff line
@@ -2401,12 +2401,11 @@ void ieee80211_dynamic_ps_timer(struct timer_list *t) 
	ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work);

}



void ieee80211_dfs_cac_timer_work(struct work_struct *work)

void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work)

{

	struct delayed_work *delayed_work = to_delayed_work(work);

	struct ieee80211_link_data *link =

		container_of(delayed_work, struct ieee80211_link_data,

			     dfs_cac_timer_work);

		container_of(work, struct ieee80211_link_data,

			     dfs_cac_timer_work.work);

	struct cfg80211_chan_def chandef = link->conf->chandef;

	struct ieee80211_sub_if_data *sdata = link->sdata;