ath9k: fall back to the default noise floor if the calibrated one is not available...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26494 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch b/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch
index 2fa4c44..2753c87 100644 (file)
--- a/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch
+++ b/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch
@@ -16,7 +16,7 @@
        rx_status->freq = hw->conf.channel->center_freq;
 -      rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
 +
        rx_status->freq = hw->conf.channel->center_freq;
 -      rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
 +

-+      if (ah->curchan)
++      if (ah->curchan && ah->curchan->noisefloor)

 +              noise = ah->curchan->noisefloor;
 +      else
 +              noise = ATH_DEFAULT_NOISE_FLOOR;
 +              noise = ah->curchan->noisefloor;
 +      else
 +              noise = ATH_DEFAULT_NOISE_FLOOR;