mac80211: backport support for background radar detection

[openwrt/staging/chunkeey.git] / package / kernel / mac80211 / patches / subsys / 500-mac80211_configure_antenna_gain.patch

diff --git a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
index 3140eee5d06adc71231d1b315f62bd59592eec2b..2dbbb2cc961e5d2ba5f20aa0074d6aaf67c2549b 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
@@ -8,7 +8,7 @@
   *
   * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
   *    functions to adjust rfkill hw state
-@@ -4193,6 +4194,7 @@ struct cfg80211_ops {
+@@ -4202,6 +4203,7 @@ struct cfg80211_ops {
                                enum nl80211_tx_power_setting type, int mbm);
        int     (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
                                int *dbm);
@@ -36,9 +36,9 @@
        u8 ps_dtim_period;
 --- a/include/uapi/linux/nl80211.h
 +++ b/include/uapi/linux/nl80211.h
-@@ -2608,6 +2608,9 @@ enum nl80211_commands {
-  *    Mandatory parameter for the transmitting interface to enable MBSSID.
-  *    Optional for the non-transmitting interfaces.
+@@ -2615,6 +2615,9 @@ enum nl80211_commands {
+  *    switching on a different channel during CAC detection on the selected
+  *    radar channel.
   *
 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
 + *    transmit power to stay within regulatory limits. u32, dBi.
@@ -46,9 +46,9 @@
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use
-@@ -3114,6 +3117,8 @@ enum nl80211_attrs {
-       NL80211_ATTR_MBSSID_CONFIG,
-       NL80211_ATTR_MBSSID_ELEMS,
+@@ -3123,6 +3126,8 @@ enum nl80211_attrs {
+ 
+       NL80211_ATTR_RADAR_BACKGROUND,
  
 +      NL80211_ATTR_WIPHY_ANTENNA_GAIN,
 +
@@ -77,7 +77,7 @@
  static void ieee80211_rfkill_poll(struct wiphy *wiphy)
  {
        struct ieee80211_local *local = wiphy_priv(wiphy);
-@@ -4399,6 +4412,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -4411,6 +4424,7 @@ const struct cfg80211_ops mac80211_confi
        .set_wiphy_params = ieee80211_set_wiphy_params,
        .set_tx_power = ieee80211_set_tx_power,
        .get_tx_power = ieee80211_get_tx_power,
@@ -129,15 +129,15 @@
        local->hw.max_mtu = IEEE80211_MAX_DATA_LEN;
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -793,6 +793,7 @@ static const struct nla_policy nl80211_p
-       [NL80211_ATTR_MBSSID_CONFIG] =
+@@ -794,6 +794,7 @@ static const struct nla_policy nl80211_p
                        NLA_POLICY_NESTED(nl80211_mbssid_config_policy),
        [NL80211_ATTR_MBSSID_ELEMS] = { .type = NLA_NESTED },
+       [NL80211_ATTR_RADAR_BACKGROUND] = { .type = NLA_FLAG },
 +      [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
  };
  
  /* policy for the key attributes */
-@@ -3374,6 +3375,22 @@ static int nl80211_set_wiphy(struct sk_b
+@@ -3375,6 +3376,22 @@ static int nl80211_set_wiphy(struct sk_b
                        goto out;
        }