diff options
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r-- | net/mac80211/chan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index fcb2cd8ffd07..4ed229c0966a 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c | |||
@@ -742,7 +742,8 @@ int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata) | |||
742 | 742 | ||
743 | int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, | 743 | int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, |
744 | const struct cfg80211_chan_def *chandef, | 744 | const struct cfg80211_chan_def *chandef, |
745 | enum ieee80211_chanctx_mode mode) | 745 | enum ieee80211_chanctx_mode mode, |
746 | bool radar_required) | ||
746 | { | 747 | { |
747 | struct ieee80211_local *local = sdata->local; | 748 | struct ieee80211_local *local = sdata->local; |
748 | struct ieee80211_chanctx_conf *conf; | 749 | struct ieee80211_chanctx_conf *conf; |
@@ -786,6 +787,7 @@ int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, | |||
786 | new_ctx->refcount++; | 787 | new_ctx->refcount++; |
787 | sdata->reserved_chanctx = new_ctx; | 788 | sdata->reserved_chanctx = new_ctx; |
788 | sdata->reserved_chandef = *chandef; | 789 | sdata->reserved_chandef = *chandef; |
790 | sdata->reserved_radar_required = radar_required; | ||
789 | out: | 791 | out: |
790 | mutex_unlock(&local->chanctx_mtx); | 792 | mutex_unlock(&local->chanctx_mtx); |
791 | return ret; | 793 | return ret; |
@@ -830,6 +832,7 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata, | |||
830 | /* unref our reservation */ | 832 | /* unref our reservation */ |
831 | ctx->refcount--; | 833 | ctx->refcount--; |
832 | sdata->reserved_chanctx = NULL; | 834 | sdata->reserved_chanctx = NULL; |
835 | sdata->radar_required = sdata->reserved_radar_required; | ||
833 | 836 | ||
834 | if (old_ctx == ctx) { | 837 | if (old_ctx == ctx) { |
835 | /* This is our own context, just change it */ | 838 | /* This is our own context, just change it */ |