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

Commit 486cf4c0 authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

mac80211: enable DFS with channel contexts 



It is okay to enable DFS for channel contexts
based drivers as long as no combination advertises
radar detection and multi-channel operation at the
same time.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 408b18ab

net/mac80211/main.c

+3 −2
Original line number Diff line number Diff line
@@ -785,13 +785,14 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
		if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_WDS))

			return -EINVAL;



		/* DFS currently not supported with channel context drivers */

		/* DFS is not supported with multi-channel combinations yet */

		for (i = 0; i < local->hw.wiphy->n_iface_combinations; i++) {

			const struct ieee80211_iface_combination *comb;



			comb = &local->hw.wiphy->iface_combinations[i];



			if (comb->radar_detect_widths)

			if (comb->radar_detect_widths &&

			    comb->num_different_channels > 1)

				return -EINVAL;

		}

	}

net/mac80211/util.c

+14 −2
Original line number Diff line number Diff line
@@ -2526,11 +2526,23 @@ 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 = local->hw.conf.chandef;

	struct ieee80211_chanctx *ctx;

	int num_chanctx = 0;



	mutex_lock(&local->chanctx_mtx);

	list_for_each_entry(ctx, &local->chanctx_list, list) {

		if (ctx->replace_state == IEEE80211_CHANCTX_REPLACES_OTHER)

			continue;



		num_chanctx++;

		chandef = ctx->conf.def;

	}

	mutex_unlock(&local->chanctx_mtx);



	ieee80211_dfs_cac_cancel(local);



	if (local->use_chanctx)

		/* currently not handled */

	if (num_chanctx > 1)

		/* XXX: multi-channel is not supported yet */

		WARN_ON(1);

	else

		cfg80211_radar_event(local->hw.wiphy, &chandef, GFP_KERNEL);