2 files changed, 7 insertions, 2 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)
 
 int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,
                                   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_chanctx_conf *conf;
@@ -786,6 +787,7 @@ int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,
         new_ctx->refcount++;
         sdata->reserved_chanctx = new_ctx;
         sdata->reserved_chandef = *chandef;
+        sdata->reserved_radar_required = radar_required;
 out:
         mutex_unlock(&local->chanctx_mtx);
         return ret;
@@ -830,6 +832,7 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata,
         /* unref our reservation */
         ctx->refcount--;
         sdata->reserved_chanctx = NULL;
+        sdata->radar_required = sdata->reserved_radar_required;
 
         if (old_ctx == ctx) {
                 /* This is our own context, just change it */
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index bfc3ca506fbd..4018ba13c028 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -759,6 +759,7 @@ struct ieee80211_sub_if_data {
         /* context reservation -- protected with chanctx_mtx */
         struct ieee80211_chanctx *reserved_chanctx;
         struct cfg80211_chan_def reserved_chandef;
+        bool reserved_radar_required;
 
         /* used to reconfigure hardware SM PS */
         struct work_struct recalc_smps;
@@ -1777,7 +1778,8 @@ ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
 int __must_check
 ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata,
                               const struct cfg80211_chan_def *chandef,
-                              enum ieee80211_chanctx_mode mode);
+                              enum ieee80211_chanctx_mode mode,
+                              bool radar_required);
 int __must_check
 ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata,
                                    u32 *changed);