diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
commit | 47f462d16716fdbcb24af448009d7c84f26c33d3 (patch) | |
tree | 3bb43623cbdd8222e53e7e2a9a85122ec6ce2adc /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
parent | b798df3e960f6bcb4910a4bee447ccadc0bb7d97 (diff) | |
download | upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.tar.gz upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.tar.bz2 upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.zip |
mac80211: update to wireless-testing 2014-11-04
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43210 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 | 22 |
1 files changed, 11 insertions, 11 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 a6119c5544..32fde8fc1b 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 -@@ -2214,6 +2214,7 @@ struct cfg80211_qos_map { +@@ -2245,6 +2245,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 * -@@ -2450,6 +2451,7 @@ struct cfg80211_ops { +@@ -2495,6 +2496,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 -@@ -1075,6 +1075,7 @@ enum ieee80211_smps_mode { +@@ -1078,6 +1078,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 -@@ -1096,6 +1097,7 @@ struct ieee80211_conf { +@@ -1099,6 +1100,7 @@ struct ieee80211_conf { u32 flags; int power_level, dynamic_ps_timeout; int max_sleep_period; @@ -36,7 +36,7 @@ u8 ps_dtim_period; --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h -@@ -1638,6 +1638,9 @@ enum nl80211_commands { +@@ -1656,6 +1656,9 @@ enum nl80211_commands { * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see * &enum nl80211_smps_mode. * @@ -46,7 +46,7 @@ * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */ -@@ -1990,6 +1993,8 @@ enum nl80211_attrs { +@@ -2008,6 +2011,8 @@ enum nl80211_attrs { NL80211_ATTR_SMPS_MODE, @@ -57,7 +57,7 @@ __NL80211_ATTR_AFTER_LAST, --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2091,6 +2091,19 @@ static int ieee80211_get_tx_power(struct +@@ -2155,6 +2155,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) { -@@ -3572,6 +3585,7 @@ const struct cfg80211_ops mac80211_confi +@@ -3723,6 +3736,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 -@@ -1280,6 +1280,7 @@ struct ieee80211_local { +@@ -1330,6 +1330,7 @@ struct ieee80211_local { int dynamic_ps_forced_timeout; int user_power_level; /* in dBm, for all interfaces */ @@ -119,7 +119,7 @@ if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; local->hw.conf.power_level = power; -@@ -585,6 +591,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -578,6 +584,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; @@ -137,7 +137,7 @@ }; /* policy for the key attributes */ -@@ -2179,6 +2180,20 @@ static int nl80211_set_wiphy(struct sk_b +@@ -2184,6 +2185,20 @@ static int nl80211_set_wiphy(struct sk_b return result; } |