mac80211: backport latest version from trunk as of r27395

[openwrt-10.03/.git] / package / mac80211 / patches / 440-ath5k_calibrate_srev_checks.patch

diff --git a/package/mac80211/patches/440-ath5k_calibrate_srev_checks.patch b/package/mac80211/patches/440-ath5k_calibrate_srev_checks.patch
new file mode 100644 (file)
index 0000000..cbfdad4
--- /dev/null
+++ b/package/mac80211/patches/440-ath5k_calibrate_srev_checks.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/wireless/ath/ath5k/phy.c
++++ b/drivers/net/wireless/ath/ath5k/phy.c
+@@ -1604,11 +1604,13 @@ int ath5k_hw_phy_calibrate(struct ath5k_
+       int ret;
+ 
+       if (ah->ah_radio == AR5K_RF5110)
+-              ret = ath5k_hw_rf5110_calibrate(ah, channel);
+-      else {
+-              ret = ath5k_hw_rf511x_iq_calibrate(ah);
++              return ath5k_hw_rf5110_calibrate(ah, channel);
++
++      ret = ath5k_hw_rf511x_iq_calibrate(ah);
++
++      if (ah->ah_radio == AR5K_RF5112 &&
++          (channel->hw_value & (CHANNEL_5GHZ | CHANNEL_OFDM)))
+               ath5k_hw_request_rfgain_probe(ah);
+-      }
+ 
+       return ret;
+ }