diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-06-26 19:00:01 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-07-02 19:34:50 +0200 |
commit | 67a7daa938671a5c7006e5d689c297a26499d75c (patch) | |
tree | c11db1b831745bcc356f105f421cefbba938cb41 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
parent | de165b66be47497906d3cf4f1ca6071ee25e2003 (diff) | |
download | upstream-67a7daa938671a5c7006e5d689c297a26499d75c.tar.gz upstream-67a7daa938671a5c7006e5d689c297a26499d75c.tar.bz2 upstream-67a7daa938671a5c7006e5d689c297a26499d75c.zip |
mac80211: update to wireless-testing 2016-06-20
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch')
-rw-r--r-- | package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch index 28f5dcca90..c40598dde6 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2406,6 +2406,7 @@ struct cfg80211_qos_map { +@@ -2410,6 +2410,7 @@ struct cfg80211_qos_map { * (as advertised by the nl80211 feature flag.) * @get_tx_power: store the current TX power into the dbm variable; * return 0 if successful @@ -8,7 +8,7 @@ * * @set_wds_peer: set the WDS peer for a WDS interface * -@@ -2667,6 +2668,7 @@ struct cfg80211_ops { +@@ -2671,6 +2672,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,7 +18,7 @@ const u8 *addr); --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1305,6 +1305,7 @@ enum ieee80211_smps_mode { +@@ -1317,6 +1317,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 @@ -26,7 +26,7 @@ * * @chandef: the channel definition to tune to * @radar_enabled: whether radar detection is enabled -@@ -1325,6 +1326,7 @@ enum ieee80211_smps_mode { +@@ -1337,6 +1338,7 @@ enum ieee80211_smps_mode { struct ieee80211_conf { u32 flags; int power_level, dynamic_ps_timeout; @@ -36,9 +36,9 @@ u8 ps_dtim_period; --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h -@@ -1819,6 +1819,9 @@ enum nl80211_commands { - * - * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment +@@ -1829,6 +1829,9 @@ enum nl80211_commands { + * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per + * interface type. * + * @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 -@@ -2201,6 +2204,8 @@ enum nl80211_attrs { +@@ -2213,6 +2216,8 @@ enum nl80211_attrs { - NL80211_ATTR_PAD, + NL80211_ATTR_IFTYPE_EXT_CAPA, + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + @@ -87,7 +87,7 @@ CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1322,6 +1322,7 @@ struct ieee80211_local { +@@ -1338,6 +1338,7 @@ struct ieee80211_local { int dynamic_ps_forced_timeout; int user_power_level; /* in dBm, for all interfaces */ @@ -129,7 +129,7 @@ local->user_power_level = IEEE80211_UNSET_POWER_LEVEL; --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -406,6 +406,7 @@ static const struct nla_policy nl80211_p +@@ -407,6 +407,7 @@ static const struct nla_policy nl80211_p [NL80211_ATTR_PBSS] = { .type = NLA_FLAG }, [NL80211_ATTR_BSS_SELECT] = { .type = NLA_NESTED }, [NL80211_ATTR_STA_SUPPORT_P2P_PS] = { .type = NLA_U8 }, @@ -137,7 +137,7 @@ }; /* policy for the key attributes */ -@@ -2251,6 +2252,20 @@ static int nl80211_set_wiphy(struct sk_b +@@ -2294,6 +2295,20 @@ static int nl80211_set_wiphy(struct sk_b if (result) return result; } |