diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-06-30 10:44:19 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-06-30 10:44:19 +0000 |
commit | dc7be3f64c1d858780953b64128b8f857f8b30d1 (patch) | |
tree | 2d2cb201800aa78e23cc19a5c8abd754da2e4fc5 /package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch | |
parent | 5fca070da8a650af61617f8765b670dcedd195fe (diff) | |
download | master-187ad058-dc7be3f64c1d858780953b64128b8f857f8b30d1.tar.gz master-187ad058-dc7be3f64c1d858780953b64128b8f857f8b30d1.tar.bz2 master-187ad058-dc7be3f64c1d858780953b64128b8f857f8b30d1.zip |
mac80211: update to wireless-testing 2013-06-27, fix ATH_USER_REGD handling
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37097 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch')
-rw-r--r-- | package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch index 759812bfd7..354ea03597 100644 --- a/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch @@ -1,6 +1,6 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -997,6 +997,7 @@ enum ieee80211_smps_mode { +@@ -999,6 +999,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 @@ -8,7 +8,7 @@ * * @chandef: the channel definition to tune to * @radar_enabled: whether radar detection is enabled -@@ -1018,6 +1019,7 @@ struct ieee80211_conf { +@@ -1020,6 +1021,7 @@ struct ieee80211_conf { u32 flags; int power_level, dynamic_ps_timeout; int max_sleep_period; @@ -47,7 +47,7 @@ }; /* policy for the key attributes */ -@@ -1953,6 +1954,22 @@ static int nl80211_set_wiphy(struct sk_b +@@ -1991,6 +1992,22 @@ static int nl80211_set_wiphy(struct sk_b goto bad_res; } @@ -92,7 +92,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -3484,6 +3497,7 @@ struct cfg80211_ops mac80211_config_ops +@@ -3474,6 +3487,7 @@ struct cfg80211_ops mac80211_config_ops .set_wiphy_params = ieee80211_set_wiphy_params, .set_tx_power = ieee80211_set_tx_power, .get_tx_power = ieee80211_get_tx_power, @@ -102,7 +102,7 @@ CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -1942,6 +1942,7 @@ struct cfg80211_update_ft_ies_params { +@@ -1970,6 +1970,7 @@ struct cfg80211_update_ft_ies_params { * (as advertised by the nl80211 feature flag.) * @get_tx_power: store the current TX power into the dbm variable; * return 0 if successful @@ -110,7 +110,7 @@ * * @set_wds_peer: set the WDS peer for a WDS interface * -@@ -2161,6 +2162,7 @@ struct cfg80211_ops { +@@ -2189,6 +2190,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); |