cfg80211: check radar interface combinations

To ease further DFS development regarding interface combinations, use
the interface combinations structure to test for radar capabilities.
Drivers can specify which channel widths they support, and in which
modes. Right now only a single AP interface is allowed, but as the
DFS code evolves other combinations can be enabled.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 5 insertions, 0 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f1686d460e6b..970da4420676 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2125,6 +2125,7 @@ struct ieee80211_iface_limit {
  * @beacon_int_infra_match: In this combination, the beacon intervals
  *      between infrastructure and AP types must match. This is required
  *      only in special cases.
+ * @radar_detect_widths: bitmap of channel widths supported for radar detection
  *
  * These examples can be expressed as follows:
  *
@@ -2177,6 +2178,7 @@ struct ieee80211_iface_combination {
         u16 max_interfaces;
         u8 n_limits;
         bool beacon_int_infra_match;
+        u8 radar_detect_widths;
 };
 
 struct mac_address {
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index d01c16220dc5..e6eeb4ba5dc5 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2984,6 +2984,8 @@ enum nl80211_iface_limit_attrs {
  *      the infrastructure network's beacon interval.
  * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many
  *      different channels may be used within this group.
+ * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
+ *      of supported channel widths for radar detection.
  * @NUM_NL80211_IFACE_COMB: number of attributes
  * @MAX_NL80211_IFACE_COMB: highest attribute number
  *
@@ -3016,6 +3018,7 @@ enum nl80211_if_combination_attrs {
         NL80211_IFACE_COMB_MAXNUM,
         NL80211_IFACE_COMB_STA_AP_BI_MATCH,
         NL80211_IFACE_COMB_NUM_CHANNELS,
+        NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
 
         /* keep last */
         NUM_NL80211_IFACE_COMB,