mac80211: Update to version 5.12.19-1

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / subsys / 387-nl80211-add-support-for-BSS-coloring.patch

diff --git a/package/kernel/mac80211/patches/subsys/387-nl80211-add-support-for-BSS-coloring.patch b/package/kernel/mac80211/patches/subsys/387-nl80211-add-support-for-BSS-coloring.patch
index 6a1757a38a01519979b26af97923db6154621cb8..3ed4543adbb0e5c97a677d8c1f8986b53cd8c564 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/387-nl80211-add-support-for-BSS-coloring.patch
+++ b/package/kernel/mac80211/patches/subsys/387-nl80211-add-support-for-BSS-coloring.patch
@@ -51,7 +51,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
   * struct iface_combination_params - input parameters for interface combinations
   *
   * Used to pass interface combination parameters
-@@ -3975,6 +3996,8 @@ struct mgmt_frame_regs {
+@@ -3983,6 +4004,8 @@ struct mgmt_frame_regs {
   *    given TIDs. This callback may sleep.
   *
   * @set_sar_specs: Update the SAR (TX power) settings.
@@ -60,7 +60,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
   */
  struct cfg80211_ops {
        int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
-@@ -4302,6 +4325,9 @@ struct cfg80211_ops {
+@@ -4310,6 +4333,9 @@ struct cfg80211_ops {
                                    const u8 *peer, u8 tids);
        int     (*set_sar_specs)(struct wiphy *wiphy,
                                 struct cfg80211_sar_specs *sar);
@@ -70,7 +70,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  };
  
  /*
-@@ -8089,4 +8115,70 @@ void cfg80211_update_owe_info_event(stru
+@@ -8193,4 +8219,70 @@ void cfg80211_update_owe_info_event(stru
   */
  void cfg80211_bss_flush(struct wiphy *wiphy);
  
@@ -230,10 +230,10 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        NUM_NL80211_EXT_FEATURES,
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -753,6 +753,10 @@ static const struct nla_policy nl80211_p
-                                NL80211_SAE_PWE_BOTH),
+@@ -774,6 +774,10 @@ static const struct nla_policy nl80211_p
        [NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },
        [NL80211_ATTR_SAR_SPEC] = NLA_POLICY_NESTED(sar_policy),
+       [NL80211_ATTR_DISABLE_HE] = { .type = NLA_FLAG },
 +      [NL80211_ATTR_OBSS_COLOR_BITMAP] = { .type = NLA_U64 },
 +      [NL80211_ATTR_COLOR_CHANGE_COUNT] = { .type = NLA_U8 },
 +      [NL80211_ATTR_COLOR_CHANGE_COLOR] = { .type = NLA_U8 },
@@ -241,7 +241,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  };
  
  /* policy for the key attributes */
-@@ -14659,6 +14663,106 @@ bad_tid_conf:
+@@ -14813,6 +14817,106 @@ bad_tid_conf:
        return ret;
  }
  
@@ -348,7 +348,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  #define NL80211_FLAG_NEED_WIPHY               0x01
  #define NL80211_FLAG_NEED_NETDEV      0x02
  #define NL80211_FLAG_NEED_RTNL                0x04
-@@ -15730,6 +15834,14 @@ static const struct genl_small_ops nl802
+@@ -15813,6 +15917,14 @@ static const struct genl_small_ops nl802
                .internal_flags = NL80211_FLAG_NEED_WIPHY |
                                  NL80211_FLAG_NEED_RTNL,
        },
@@ -363,7 +363,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  };
  
  static struct genl_family nl80211_fam __genl_ro_after_init = {
-@@ -17361,6 +17473,51 @@ void cfg80211_ch_switch_started_notify(s
+@@ -17444,6 +17556,51 @@ void cfg80211_ch_switch_started_notify(s
  }
  EXPORT_SYMBOL(cfg80211_ch_switch_started_notify);