mac80211: backport MBSSID support

[openwrt/staging/mkresin.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 2dbbb2cc961e5d2ba5f20aa0074d6aaf67c2549b..c4acfd14374c39eac195091042bd01fd5e9d4d18 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
@@ -57,7 +57,7 @@
        __NL80211_ATTR_AFTER_LAST,
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2764,6 +2764,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2845,6 +2845,19 @@ static int ieee80211_get_tx_power(struct
        return 0;
  }
  
@@ -77,7 +77,7 @@
  static void ieee80211_rfkill_poll(struct wiphy *wiphy)
  {
        struct ieee80211_local *local = wiphy_priv(wiphy);
-@@ -4411,6 +4424,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -4549,6 +4562,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,
@@ -87,7 +87,7 @@
        CFG80211_TESTMODE_DUMP(ieee80211_testmode_dump)
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -1429,6 +1429,7 @@ struct ieee80211_local {
+@@ -1444,6 +1444,7 @@ struct ieee80211_local {
        int dynamic_ps_forced_timeout;
  
        int user_power_level; /* in dBm, for all interfaces */
@@ -137,10 +137,11 @@
  };
  
  /* policy for the key attributes */
-@@ -3375,6 +3376,22 @@ static int nl80211_set_wiphy(struct sk_b
+@@ -3374,6 +3375,22 @@ static int nl80211_set_wiphy(struct sk_b
+               if (result)
                        goto out;
        }
- 
++
 +      if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
 +              int idx, dbi = 0;
 +
@@ -156,7 +157,6 @@
 +              if (result)
 +                      goto out;
 +      }
-+
+ 
        if (info->attrs[NL80211_ATTR_WIPHY_TX_POWER_SETTING]) {
                struct wireless_dev *txp_wdev = wdev;
-               enum nl80211_tx_power_setting type;