aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/530-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-18 11:27:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-18 11:27:19 +0000
commit7edf0229435ce1d11bc8096c95e93373d7fda71f (patch)
tree5366708341c61ef88965c36fb8e15bdd4088cd3a /package/mac80211/patches/530-mac80211_cur_txpower.patch
parent7d6a631816dfec96e57068189d2a5c463e0d1314 (diff)
downloadupstream-7edf0229435ce1d11bc8096c95e93373d7fda71f.tar.gz
upstream-7edf0229435ce1d11bc8096c95e93373d7fda71f.tar.bz2
upstream-7edf0229435ce1d11bc8096c95e93373d7fda71f.zip
mac80211: update to wireless-testing 2011-11-15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/530-mac80211_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/530-mac80211_cur_txpower.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/530-mac80211_cur_txpower.patch b/package/mac80211/patches/530-mac80211_cur_txpower.patch
index f93512d7b8..0fa6a229fd 100644
--- a/package/mac80211/patches/530-mac80211_cur_txpower.patch
+++ b/package/mac80211/patches/530-mac80211_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -815,7 +815,7 @@ enum ieee80211_smps_mode {
+@@ -816,7 +816,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
-@@ -1615,7 +1615,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1677,7 +1677,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
-@@ -210,6 +210,7 @@ int ieee80211_hw_config(struct ieee80211
+@@ -208,6 +208,7 @@ int ieee80211_hw_config(struct ieee80211
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;