mac80211: backport latest version from trunk (as of r28137)

[openwrt-10.03/.git] / package / mac80211 / patches / 530-mac80211_cur_txpower.patch

diff --git a/package/mac80211/patches/550-mac80211_cur_txpower.patch b/package/mac80211/patches/530-mac80211_cur_txpower.patch
similarity index 87%
rename from package/mac80211/patches/550-mac80211_cur_txpower.patch
rename to package/mac80211/patches/530-mac80211_cur_txpower.patch
index 8e729c1a443d96dad41032b4c606d043ceb21fbc..a8a042b7ee50adf7d6157e71fd53f3a761899f92 100644 (file)
--- a/package/mac80211/patches/550-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
-@@ -779,7 +779,7 @@ enum ieee80211_smps_mode {
+@@ -790,7 +790,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
-@@ -1524,7 +1524,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1551,7 +1551,7 @@ static int ieee80211_get_tx_power(struct
  {
        struct ieee80211_local *local = wiphy_priv(wiphy);