mac80211: DFS setup chandef for radar_event correctly (84a3d1c9) · Commits · 戴 / test

Setup chandef for radar event correctly, before we will clear this in ieee80211_dfs_cac_cancel() function. Without this patch mac80211 will report wrong channel width in case we will get radar event during active CAC. Signed-off-by:

Janusz Dziedzic <janusz.dziedzic@tieto.com> Reviewed-by:

Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/util.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -2278,18 +2278,16 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work)
		{
		struct ieee80211_local *local =
		container_of(work, struct ieee80211_local, radar_detected_work);
		struct cfg80211_chan_def chandef;
		struct cfg80211_chan_def chandef = local->hw.conf.chandef;

		ieee80211_dfs_cac_cancel(local);

		if (local->use_chanctx)
		/* currently not handled */
		WARN_ON(1);
		else {
		chandef = local->hw.conf.chandef;
		else
		cfg80211_radar_event(local->hw.wiphy, &chandef, GFP_KERNEL);
		}
		}

		void ieee80211_radar_detected(struct ieee80211_hw *hw)
		{

Admin message