kernel: update linux 3.2 to 3.2.9

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

diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/531-ath9k_cur_txpower.patch
index 894d780..46f2004 100644 (file)
--- a/package/mac80211/patches/531-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/531-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -1714,6 +1714,8 @@ static int ath9k_config(struct ieee80211
+@@ -1653,6 +1653,8 @@ int ath9k_config(struct ieee80211_hw *hw

                        return -EINVAL;
                }
  
                        return -EINVAL;
                }
  


@@ -9,11 +9,11 @@
                /*
                 * The most recent snapshot of channel->noisefloor for the old
                 * channel is only available after the hardware reset. Copy it to
                /*
                 * The most recent snapshot of channel->noisefloor for the old
                 * channel is only available after the hardware reset. Copy it to

-@@ -1731,6 +1733,7 @@ static int ath9k_config(struct ieee80211
+@@ -1667,6 +1669,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);
                ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                       sc->config.txpowlimit, &sc->curtxpow);

-               ath9k_ps_restore(sc);

 +              conf->cur_power_level = sc->curtxpow / 2;
        }
  
 +              conf->cur_power_level = sc->curtxpow / 2;
        }
  

-       if (disable_radio) {
+       mutex_unlock(&sc->mutex);