projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mac80211: update to version based on 4.19-rc4
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 522-mac80211_configure_antenna_gain.patch
diff --git a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch
index 3546b1d439cc799e0784130e38f6f438bdb25e08..86bd2905ae6724cf012ce8b35067d6096b604663 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch
@@ -1,8 +1,6 @@
-Index: backports-v4.18-rc7/include/net/cfg80211.h
-===================================================================
---- backports-v4.18-rc7.orig/include/net/cfg80211.h
-+++ backports-v4.18-rc7/include/net/cfg80211.h
-@@ -2857,6 +2857,7 @@ struct cfg80211_external_auth_params {
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -2959,6 +2959,7 @@ struct cfg80211_external_auth_params {
   *    (as advertised by the nl80211 feature flag.)
   * @get_tx_power: store the current TX power into the dbm variable;
   *    return 0 if successful
@@ -10,7 +8,7 @@ Index: backports-v4.18-rc7/include/net/cfg80211.h
   *
   * @set_wds_peer: set the WDS peer for a WDS interface
   *
-@@ -3157,6 +3158,7 @@ struct cfg80211_ops {
+@@ -3259,6 +3260,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);
@@ -18,11 +16,9 @@ Index: backports-v4.18-rc7/include/net/cfg80211.h
  
        int     (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
                                const u8 *addr);
-Index: backports-v4.18-rc7/include/net/mac80211.h
-===================================================================
---- backports-v4.18-rc7.orig/include/net/mac80211.h
-+++ backports-v4.18-rc7/include/net/mac80211.h
-@@ -1348,6 +1348,7 @@ enum ieee80211_smps_mode {
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1389,6 +1389,7 @@ enum ieee80211_smps_mode {
   *
   * @power_level: requested transmit power (in dBm), backward compatibility
   *    value only that is set to the minimum of all interfaces
@@ -30,7 +26,7 @@ Index: backports-v4.18-rc7/include/net/mac80211.h
   *
   * @chandef: the channel definition to tune to
   * @radar_enabled: whether radar detection is enabled
-@@ -1368,6 +1369,7 @@ enum ieee80211_smps_mode {
+@@ -1409,6 +1410,7 @@ enum ieee80211_smps_mode {
  struct ieee80211_conf {
        u32 flags;
        int power_level, dynamic_ps_timeout;
@@ -38,13 +34,11 @@ Index: backports-v4.18-rc7/include/net/mac80211.h
  
        u16 listen_interval;
        u8 ps_dtim_period;
-Index: backports-v4.18-rc7/include/uapi/linux/nl80211.h
-===================================================================
---- backports-v4.18-rc7.orig/include/uapi/linux/nl80211.h
-+++ backports-v4.18-rc7/include/uapi/linux/nl80211.h
-@@ -2238,6 +2238,9 @@ enum nl80211_commands {
-  * @NL80211_ATTR_TXQ_QUANTUM: TXQ scheduler quantum (bytes). Number of bytes
-  *      a flow is assigned on each round of the DRR scheduler.
+--- a/include/uapi/linux/nl80211.h
++++ b/include/uapi/linux/nl80211.h
+@@ -2241,6 +2241,9 @@ enum nl80211_commands {
+  *    association request when used with NL80211_CMD_NEW_STATION). Can be set
+  *    only if %NL80211_STA_FLAG_WME is set.
   *
 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
 + *    transmit power to stay within regulatory limits. u32, dBi.
@@ -52,20 +46,18 @@ Index: backports-v4.18-rc7/include/uapi/linux/nl80211.h
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use
-@@ -2677,6 +2680,8 @@ enum nl80211_attrs {
-       NL80211_ATTR_TXQ_MEMORY_LIMIT,
-       NL80211_ATTR_TXQ_QUANTUM,
+@@ -2682,6 +2685,8 @@ enum nl80211_attrs {
+ 
+       NL80211_ATTR_HE_CAPABILITY,
  
 +      NL80211_ATTR_WIPHY_ANTENNA_GAIN,
 +
        /* add attributes here, update the policy in nl80211.c */
  
        __NL80211_ATTR_AFTER_LAST,
-Index: backports-v4.18-rc7/net/mac80211/cfg.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/cfg.c
-+++ backports-v4.18-rc7/net/mac80211/cfg.c
-@@ -2489,6 +2489,19 @@ static int ieee80211_get_tx_power(struct
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -2494,6 +2494,19 @@ static int ieee80211_get_tx_power(struct
        return 0;
  }
  
@@ -85,7 +77,7 @@ Index: backports-v4.18-rc7/net/mac80211/cfg.c
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
                                  const u8 *addr)
  {
-@@ -3856,6 +3869,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -3861,6 +3874,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,
@@ -93,11 +85,9 @@ Index: backports-v4.18-rc7/net/mac80211/cfg.c
        .set_wds_peer = ieee80211_set_wds_peer,
        .rfkill_poll = ieee80211_rfkill_poll,
        CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
-Index: backports-v4.18-rc7/net/mac80211/ieee80211_i.h
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/ieee80211_i.h
-+++ backports-v4.18-rc7/net/mac80211/ieee80211_i.h
-@@ -1350,6 +1350,7 @@ struct ieee80211_local {
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1352,6 +1352,7 @@ struct ieee80211_local {
        int dynamic_ps_forced_timeout;
  
        int user_power_level; /* in dBm, for all interfaces */
@@ -105,11 +95,9 @@ Index: backports-v4.18-rc7/net/mac80211/ieee80211_i.h
  
        enum ieee80211_smps_mode smps_mode;
  
-Index: backports-v4.18-rc7/net/mac80211/main.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/main.c
-+++ backports-v4.18-rc7/net/mac80211/main.c
-@@ -93,7 +93,7 @@ static u32 ieee80211_hw_conf_chan(struct
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -94,7 +94,7 @@ static u32 ieee80211_hw_conf_chan(struct
        struct ieee80211_sub_if_data *sdata;
        struct cfg80211_chan_def chandef = {};
        u32 changed = 0;
@@ -118,7 +106,7 @@ Index: backports-v4.18-rc7/net/mac80211/main.c
        u32 offchannel_flag;
  
        offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
-@@ -150,6 +150,12 @@ static u32 ieee80211_hw_conf_chan(struct
+@@ -151,6 +151,12 @@ static u32 ieee80211_hw_conf_chan(struct
        }
        rcu_read_unlock();
  
@@ -131,7 +119,7 @@ Index: backports-v4.18-rc7/net/mac80211/main.c
        if (local->hw.conf.power_level != power) {
                changed |= IEEE80211_CONF_CHANGE_POWER;
                local->hw.conf.power_level = power;
-@@ -611,6 +617,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+@@ -626,6 +632,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
                                         IEEE80211_RADIOTAP_MCS_HAVE_BW;
        local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
                                         IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
@@ -139,19 +127,17 @@ Index: backports-v4.18-rc7/net/mac80211/main.c
        local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
        local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
        local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
-Index: backports-v4.18-rc7/net/wireless/nl80211.c
-===================================================================
---- backports-v4.18-rc7.orig/net/wireless/nl80211.c
-+++ backports-v4.18-rc7/net/wireless/nl80211.c
-@@ -428,6 +428,7 @@ static const struct nla_policy nl80211_p
-       [NL80211_ATTR_TXQ_LIMIT] = { .type = NLA_U32 },
-       [NL80211_ATTR_TXQ_MEMORY_LIMIT] = { .type = NLA_U32 },
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -430,6 +430,7 @@ static const struct nla_policy nl80211_p
        [NL80211_ATTR_TXQ_QUANTUM] = { .type = NLA_U32 },
+       [NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY,
+                                        .len = NL80211_HE_MAX_CAPABILITY_LEN },
 +      [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
  };
  
  /* policy for the key attributes */
-@@ -2531,6 +2532,20 @@ static int nl80211_set_wiphy(struct sk_b
+@@ -2587,6 +2588,20 @@ static int nl80211_set_wiphy(struct sk_b
                if (result)
                        return result;
        }
OpenWrt Source Repository