mac80211: update to wireless-testing 2012-12-06

[openwrt/openwrt.git] / package / mac80211 / patches / 521-ath9k_cur_txpower.patch

diff --git a/package/mac80211/patches/521-ath9k_cur_txpower.patch b/package/mac80211/patches/521-ath9k_cur_txpower.patch
index 5a59bbfdcc996cbb3b575e103ace8bcd8d5e4180..e1ef90f524d5de3c1fc3dcc8487ea1d9e3dc520a 100644 (file)
--- a/package/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,19 +1,19 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1675,6 +1675,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1199,6 +1199,8 @@ int ath9k_config(struct ieee80211_hw *hw
                        return -EINVAL;
                }
  
-+              conf->cur_power_level = sc->curtxpow / 2;
++              hw->cur_power_level = sc->curtxpow / 2;
 +
                /*
                 * The most recent snapshot of channel->noisefloor for the old
                 * channel is only available after the hardware reset. Copy it to
-@@ -1689,6 +1691,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1213,6 +1215,7 @@ int ath9k_config(struct ieee80211_hw *hw
                sc->config.txpowlimit = 2 * conf->power_level;
                ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                       sc->config.txpowlimit, &sc->curtxpow);
-+              conf->cur_power_level = sc->curtxpow / 2;
++              hw->cur_power_level = sc->curtxpow / 2;
        }
  
        mutex_unlock(&sc->mutex);