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

Commit d2859df5 authored by Janusz Dziedzic's avatar Janusz Dziedzic Committed by Johannes Berg
Browse files

cfg80211/mac80211: DFS setup chandef for cac event 



To report channel width correctly we have
to send correct channel parameters from
mac80211 when calling cfg80211_cac_event().

This is required in case of using channel width
higher than 20MHz and we have to set correct
dfs channel state after CAC (NL80211_DFS_AVAILABLE).

Signed-off-by: default avatarJanusz Dziedzic <janusz.dziedzic@tieto.com>
Reviewed-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5282c3ba

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -4150,6 +4150,7 @@ void cfg80211_radar_event(struct wiphy *wiphy, 
/**

 * cfg80211_cac_event - Channel availability check (CAC) event

 * @netdev: network device

 * @chandef: chandef for the current channel

 * @event: type of event

 * @gfp: context flags

 *
@@ -4158,6 +4159,7 @@ void cfg80211_radar_event(struct wiphy *wiphy, 
 * also by full-MAC drivers.

 */

void cfg80211_cac_event(struct net_device *netdev,

			const struct cfg80211_chan_def *chandef,

			enum nl80211_radar_event event, gfp_t gfp);

net/mac80211/cfg.c

+4 −1
Original line number Diff line number Diff line
@@ -1050,6 +1050,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
	struct ieee80211_local *local = sdata->local;

	struct beacon_data *old_beacon;

	struct probe_resp *old_probe_resp;

	struct cfg80211_chan_def chandef;



	old_beacon = rtnl_dereference(sdata->u.ap.beacon);

	if (!old_beacon)
@@ -1091,8 +1092,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);



	if (sdata->wdev.cac_started) {

		chandef = sdata->vif.bss_conf.chandef;

		cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);

		cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,

		cfg80211_cac_event(sdata->dev, &chandef,

				   NL80211_RADAR_CAC_ABORTED,

				   GFP_KERNEL);

	}

net/mac80211/iface.c

+4 −1
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	u32 hw_reconf_flags = 0;

	int i, flushed;

	struct ps_data *ps;

	struct cfg80211_chan_def chandef;



	clear_bit(SDATA_STATE_RUNNING, &sdata->state);
@@ -823,11 +824,13 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);



	if (sdata->wdev.cac_started) {

		chandef = sdata->vif.bss_conf.chandef;

		WARN_ON(local->suspended);

		mutex_lock(&local->iflist_mtx);

		ieee80211_vif_release_channel(sdata);

		mutex_unlock(&local->iflist_mtx);

		cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,

		cfg80211_cac_event(sdata->dev, &chandef,

				   NL80211_RADAR_CAC_ABORTED,

				   GFP_KERNEL);

	}

net/mac80211/mlme.c

+4 −2
Original line number Diff line number Diff line
@@ -1398,10 +1398,12 @@ void ieee80211_dfs_cac_timer_work(struct work_struct *work) 
	struct ieee80211_sub_if_data *sdata =

		container_of(delayed_work, struct ieee80211_sub_if_data,

			     dfs_cac_timer_work);

	struct cfg80211_chan_def chandef = sdata->vif.bss_conf.chandef;



	ieee80211_vif_release_channel(sdata);



	cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_FINISHED, GFP_KERNEL);

	cfg80211_cac_event(sdata->dev, &chandef,

			   NL80211_RADAR_CAC_FINISHED,

			   GFP_KERNEL);

}



/* MLME */

net/mac80211/util.c

+3 −0
Original line number Diff line number Diff line
@@ -2259,14 +2259,17 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, 
void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;

	struct cfg80211_chan_def chandef;



	mutex_lock(&local->iflist_mtx);

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

		cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);



		if (sdata->wdev.cac_started) {

			chandef = sdata->vif.bss_conf.chandef;

			ieee80211_vif_release_channel(sdata);

			cfg80211_cac_event(sdata->dev,

					   &chandef,

					   NL80211_RADAR_CAC_ABORTED,

					   GFP_KERNEL);

		}