|
@@ -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 */
|