aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/520-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-30 01:01:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-30 01:01:06 +0000
commit478ae49618fd5125dd2f7e9ab59d5b66792c9abb (patch)
tree2f300d682a8f7b238015972a6315efa60909cb89 /package/mac80211/patches/520-mac80211_cur_txpower.patch
parentce4aa59497e0f6cc2eda9e29e892cc150e40f8ac (diff)
downloadupstream-478ae49618fd5125dd2f7e9ab59d5b66792c9abb.tar.gz
upstream-478ae49618fd5125dd2f7e9ab59d5b66792c9abb.tar.bz2
upstream-478ae49618fd5125dd2f7e9ab59d5b66792c9abb.zip
mac80211: update to wireless-testing 2012-05-29
SVN-Revision: 32002
Diffstat (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/520-mac80211_cur_txpower.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch
index f1bd0bc6e8..e8893fb509 100644
--- a/package/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -825,7 +825,7 @@ enum ieee80211_smps_mode {
+@@ -829,7 +829,7 @@ enum ieee80211_smps_mode {
*/
struct ieee80211_conf {
u32 flags;
@@ -11,7 +11,7 @@
u16 listen_interval;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -1757,7 +1757,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1936,7 +1936,7 @@ static int ieee80211_get_tx_power(struct
{
struct ieee80211_local *local = wiphy_priv(wiphy);
@@ -22,7 +22,7 @@
}
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -165,6 +165,7 @@ int ieee80211_hw_config(struct ieee80211
+@@ -167,6 +167,7 @@ int ieee80211_hw_config(struct ieee80211
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;