@@ -744,6 +744,10 @@ struct key_params {
* chan will define the primary channel and all other
* parameters are ignored.
* @freq1_offset: offset from @center_freq1, in KHz
+ * @cf1_radar_bitmap: Radar bitmap in a granularity of 20 MHz in the
+ * first segment.
+ * @cf2_radar_bitmap: Radar bitmap in a granularity of 20 MHz in the
+ * second segment.
*/
struct cfg80211_chan_def {
struct ieee80211_channel *chan;
@@ -752,6 +756,8 @@ struct cfg80211_chan_def {
u32 center_freq2;
struct ieee80211_edmg edmg;
u16 freq1_offset;
+ u16 cf1_radar_bitmap;
+ u16 cf2_radar_bitmap;
};
/*
@@ -2751,6 +2751,15 @@ enum nl80211_commands {
* the incoming frame RX timestamp.
* @NL80211_ATTR_TD_BITMAP: Transition Disable bitmap, for subsequent
* (re)associations.
+ *
+ * @NL80211_ATTR_CF1_RADAR_BITMAP: (u16) RADAR bitmap where the LSB
+ * corresponds to the lowest 20 MHz of the first part of the channel.
+ * Each bit set to 1 indicates that radar is detected in that sub-channel.
+ * @NL80211_ATTR_CF2_RADAR_BITMAP: (u16) RADAR bitmap where the LSB
+ * corresponds to the lowest 20 MHz of the second part of the channel.
+ * Each bit set to 1 indicates that radar is detected in that sub-channel.
+ * This will be valid only when the %NL80211_ATTR_CENTER_FREQ2 is present.
+ *
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3279,6 +3288,8 @@ enum nl80211_attrs {
NL80211_ATTR_TX_HW_TIMESTAMP,
NL80211_ATTR_RX_HW_TIMESTAMP,
NL80211_ATTR_TD_BITMAP,
+ NL80211_ATTR_CF1_RADAR_BITMAP,
+ NL80211_ATTR_CF2_RADAR_BITMAP,
/* add attributes here, update the policy in nl80211.c */
@@ -447,20 +447,26 @@ EXPORT_SYMBOL(cfg80211_chandef_compatible);
static void cfg80211_set_chans_dfs_state(struct wiphy *wiphy, u32 center_freq,
u32 bandwidth,
- enum nl80211_dfs_state dfs_state)
+ enum nl80211_dfs_state dfs_state,
+ u16 radar_bitmap)
{
struct ieee80211_channel *c;
u32 freq;
+ int i;
- for (freq = center_freq - bandwidth/2 + 10;
- freq <= center_freq + bandwidth/2 - 10;
- freq += 20) {
+ for (i = 0, freq = center_freq - bandwidth / 2 + 10;
+ freq <= center_freq + bandwidth / 2 - 10;
+ freq += 20, i++) {
c = ieee80211_get_channel(wiphy, freq);
if (!c || !(c->flags & IEEE80211_CHAN_RADAR))
continue;
- c->dfs_state = dfs_state;
- c->dfs_state_entered = jiffies;
+ if (!radar_bitmap ||
+ ((radar_bitmap & 1 << i) &&
+ dfs_state == NL80211_DFS_UNAVAILABLE)) {
+ c->dfs_state = dfs_state;
+ c->dfs_state_entered = jiffies;
+ }
}
}
@@ -478,12 +484,14 @@ void cfg80211_set_dfs_state(struct wiphy *wiphy,
return;
cfg80211_set_chans_dfs_state(wiphy, chandef->center_freq1,
- width, dfs_state);
+ width, dfs_state,
+ chandef->cf1_radar_bitmap);
if (!chandef->center_freq2)
return;
cfg80211_set_chans_dfs_state(wiphy, chandef->center_freq2,
- width, dfs_state);
+ width, dfs_state,
+ chandef->cf2_radar_bitmap);
}
static u32 cfg80211_get_start_freq(u32 center_freq,
@@ -963,6 +963,10 @@ void __cfg80211_radar_event(struct wiphy *wiphy,
memcpy(&rdev->radar_chandef, chandef, sizeof(struct cfg80211_chan_def));
queue_work(cfg80211_wq, &rdev->propagate_radar_detect_wk);
+
+ /* Reset radar bitmaps, as they are advertised with radar detection */
+ chandef->cf1_radar_bitmap = 0;
+ chandef->cf2_radar_bitmap = 0;
}
EXPORT_SYMBOL(__cfg80211_radar_event);
@@ -805,6 +805,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN),
[NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
[NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT },
+ [NL80211_ATTR_CF1_RADAR_BITMAP] = { .type = NLA_U16 },
+ [NL80211_ATTR_CF2_RADAR_BITMAP] = { .type = NLA_U16 },
};
/* policy for the key attributes */
@@ -3763,6 +3765,15 @@ static int nl80211_send_chandef(struct sk_buff *msg,
if (chandef->center_freq2 &&
nla_put_u32(msg, NL80211_ATTR_CENTER_FREQ2, chandef->center_freq2))
return -ENOBUFS;
+ if (chandef->cf1_radar_bitmap &&
+ nla_put_u16(msg, NL80211_ATTR_CF1_RADAR_BITMAP,
+ chandef->cf1_radar_bitmap))
+ return -ENOBUFS;
+ if (chandef->cf2_radar_bitmap &&
+ nla_put_u16(msg, NL80211_ATTR_CF2_RADAR_BITMAP,
+ chandef->cf2_radar_bitmap))
+ return -ENOBUFS;
+
return 0;
}
@@ -4295,6 +4295,9 @@ void regulatory_propagate_dfs_state(struct wiphy *wiphy,
nl80211_radar_notify(rdev, chandef, event, NULL, GFP_KERNEL);
}
+ /* Reset radar bitmaps, since the propagation is done */
+ chandef->cf1_radar_bitmap = 0;
+ chandef->cf2_radar_bitmap = 0;
}
static int __init regulatory_init_db(void)
With the current implementation when radar is detected, the whole configured DFS channels are moved to "unavailable" state(NOL). However to move only the radar affected channels alone to NOL, introducing two unsigned 16bit variables "cf1_radar_bitmap" and "cf2_radar_bitmap" which denotes the radar(with a granularity of 20 MHz) in the first and the second part of the channel respectively. The "cf2_radar_bitmap" value will be valid only when the "center_freq2" is available. The LSB of the radar bitmap corresponds to the lowest 20 MHz channel of the configured channel bandwidth. Each bit set to "1" in this radar bitmap indicates that radar is detected in that sub-channel. Based on this radar bitmap the radar affected channels alone will be moved to NOL. Advertise these radar bitmaps using new NL attributes "NL80211_ATTR_CF1_RADAR_BITMAP" and "NL80211_ATTR_CF2_RADAR_BITMAP" with the existing "NL80211_CMD_RADAR_DETECT". Once these are advertised and the needed dfs state propagation is done, reset these radar bitmap values as they are not valid until there is another radar detection.With these radar bitmaps, we can support bandwidth reduction and RX puncturing in the DFS Channels. Signed-off-by: Nagarajan Maran <quic_nmaran@quicinc.com> --- include/net/cfg80211.h | 6 ++++++ include/uapi/linux/nl80211.h | 11 +++++++++++ net/wireless/chan.c | 24 ++++++++++++++++-------- net/wireless/mlme.c | 4 ++++ net/wireless/nl80211.c | 11 +++++++++++ net/wireless/reg.c | 3 +++ 6 files changed, 51 insertions(+), 8 deletions(-)