diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
commit | e78459e2b71c30d1f77cbfbe3004a2b884a2c7e9 (patch) | |
tree | 301595c77ef242281f62dff5b49a13f02afe6d29 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
parent | e99cb3cbf6c6d0d166664c9c903a7352b3be2986 (diff) | |
download | upstream-e78459e2b71c30d1f77cbfbe3004a2b884a2c7e9.tar.gz upstream-e78459e2b71c30d1f77cbfbe3004a2b884a2c7e9.tar.bz2 upstream-e78459e2b71c30d1f77cbfbe3004a2b884a2c7e9.zip |
mac80211: update to wireless-testing 2014-05-19
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40800 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 36 |
1 files changed, 18 insertions, 18 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 611f76326d..6ad04aca33 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 -@@ -2167,6 +2167,7 @@ struct cfg80211_qos_map { +@@ -2188,6 +2188,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 * -@@ -2396,6 +2397,7 @@ struct cfg80211_ops { +@@ -2422,6 +2423,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 -@@ -1579,6 +1579,9 @@ enum nl80211_commands { - * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32. - * As specified in the &enum nl80211_tdls_peer_capability. +@@ -1591,6 +1591,9 @@ enum nl80211_commands { + * creation then the new interface will be owned by the netlink socket + * that created it and will be destroyed when the socket is closed * + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce + * transmit power to stay within regulatory limits. u32, dBi. @@ -46,9 +46,9 @@ * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */ -@@ -1914,6 +1917,8 @@ enum nl80211_attrs { - - NL80211_ATTR_TDLS_PEER_CAPABILITY, +@@ -1931,6 +1934,8 @@ enum nl80211_attrs { + NL80211_ATTR_CSA_C_OFFSETS_TX, + NL80211_ATTR_MAX_CSA_COUNTERS, + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + @@ -57,7 +57,7 @@ __NL80211_ATTR_AFTER_LAST, --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2345,6 +2345,19 @@ static int ieee80211_get_tx_power(struct +@@ -2388,6 +2388,19 @@ static int ieee80211_get_tx_power(struct return 0; } @@ -77,7 +77,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -4000,6 +4013,7 @@ const struct cfg80211_ops mac80211_confi +@@ -3820,6 +3833,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_CMD(ieee80211_testmode_cmd) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1225,6 +1225,7 @@ struct ieee80211_local { +@@ -1233,6 +1233,7 @@ struct ieee80211_local { int dynamic_ps_forced_timeout; int user_power_level; /* in dBm, for all interfaces */ @@ -97,7 +97,7 @@ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -101,7 +101,7 @@ static u32 ieee80211_hw_conf_chan(struct +@@ -97,7 +97,7 @@ static u32 ieee80211_hw_conf_chan(struct struct ieee80211_sub_if_data *sdata; struct cfg80211_chan_def chandef = {}; u32 changed = 0; @@ -106,7 +106,7 @@ u32 offchannel_flag; offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; -@@ -158,6 +158,12 @@ static u32 ieee80211_hw_conf_chan(struct +@@ -154,6 +154,12 @@ static u32 ieee80211_hw_conf_chan(struct } rcu_read_unlock(); @@ -119,7 +119,7 @@ if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; local->hw.cur_power_level = power; -@@ -586,6 +592,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -584,6 +590,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; @@ -129,15 +129,15 @@ local->user_power_level = IEEE80211_UNSET_POWER_LEVEL; --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -385,6 +385,7 @@ static const struct nla_policy nl80211_p - [NL80211_ATTR_MAC_HINT] = { .len = ETH_ALEN }, - [NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 }, +@@ -387,6 +387,7 @@ static const struct nla_policy nl80211_p [NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 }, + [NL80211_ATTR_IFACE_SOCKET_OWNER] = { .type = NLA_FLAG }, + [NL80211_ATTR_CSA_C_OFFSETS_TX] = { .type = NLA_BINARY }, + [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 }, }; /* policy for the key attributes */ -@@ -2116,6 +2117,20 @@ static int nl80211_set_wiphy(struct sk_b +@@ -2162,6 +2163,20 @@ static int nl80211_set_wiphy(struct sk_b return result; } |