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

[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 adc5292..8fdd436 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

-@@ -1691,6 +1691,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1683,6 +1683,8 @@ int ath9k_config(struct ieee80211_hw *hw

                        return -EINVAL;
                }
  
                        return -EINVAL;
                }
  


@@ -9,7 +9,7 @@
                /*
                 * 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

-@@ -1706,6 +1708,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1697,6 +1699,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);
                sc->config.txpowlimit = 2 * conf->power_level;
                ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                       sc->config.txpowlimit, &sc->curtxpow);