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

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

mac80211: add support for radar detection for reservations 



Initial chanctx reservation code wasn't aware of
radar detection requirements. This is necessary
for chanctx reservations to be used for channel
switching in the future.

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

net/mac80211/chan.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,8 @@ int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata) 




int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,

int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,

				  const struct cfg80211_chan_def *chandef,

				  const struct cfg80211_chan_def *chandef,

				  enum ieee80211_chanctx_mode mode)

				  enum ieee80211_chanctx_mode mode,

				  bool radar_required)

{

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_chanctx_conf *conf;

	struct ieee80211_chanctx_conf *conf;
@@ -786,6 +787,7 @@ int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, 
	new_ctx->refcount++;

	new_ctx->refcount++;

	sdata->reserved_chanctx = new_ctx;

	sdata->reserved_chanctx = new_ctx;

	sdata->reserved_chandef = *chandef;

	sdata->reserved_chandef = *chandef;

	sdata->reserved_radar_required = radar_required;

out:

out:

	mutex_unlock(&local->chanctx_mtx);

	mutex_unlock(&local->chanctx_mtx);

	return ret;

	return ret;
@@ -830,6 +832,7 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata, 
	/* unref our reservation */

	/* unref our reservation */

	ctx->refcount--;

	ctx->refcount--;

	sdata->reserved_chanctx = NULL;

	sdata->reserved_chanctx = NULL;

	sdata->radar_required = sdata->reserved_radar_required;





	if (old_ctx == ctx) {

	if (old_ctx == ctx) {

		/* This is our own context, just change it */

		/* This is our own context, just change it */

net/mac80211/ieee80211_i.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -759,6 +759,7 @@ struct ieee80211_sub_if_data { 
	/* context reservation -- protected with chanctx_mtx */

	/* context reservation -- protected with chanctx_mtx */

	struct ieee80211_chanctx *reserved_chanctx;

	struct ieee80211_chanctx *reserved_chanctx;

	struct cfg80211_chan_def reserved_chandef;

	struct cfg80211_chan_def reserved_chandef;

	bool reserved_radar_required;





	/* used to reconfigure hardware SM PS */

	/* used to reconfigure hardware SM PS */

	struct work_struct recalc_smps;

	struct work_struct recalc_smps;
@@ -1777,7 +1778,8 @@ ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, 
int __must_check

int __must_check

ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,

ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,

			      const struct cfg80211_chan_def *chandef,

			      const struct cfg80211_chan_def *chandef,

			      enum ieee80211_chanctx_mode mode);

			      enum ieee80211_chanctx_mode mode,

			      bool radar_required);

int __must_check

int __must_check

ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata,

ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata,

				   u32 *changed);

				   u32 *changed);