diff --git a/[refs] b/[refs]
index 8b1a939231e4..297138124544 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38b33707a1ec77f7b4c92ae41cfe93318014f5bf
+refs/heads/master: e56db718468416ce5ff1ba05e7fa5026424befd5
diff --git a/trunk/drivers/net/wireless/ath9k/calib.c b/trunk/drivers/net/wireless/ath9k/calib.c
index 707289685b41..8e073d6513d5 100644
--- a/trunk/drivers/net/wireless/ath9k/calib.c
+++ b/trunk/drivers/net/wireless/ath9k/calib.c
@@ -19,8 +19,6 @@
 #include "reg.h"
 #include "phy.h"
 
-static const int16_t NOISE_FLOOR[] = { -96, -93, -98, -96, -93, -96 };
-
 /* We can tune this as we go by monitoring really low values */
 #define ATH9K_NF_TOO_LOW	-60
 
@@ -740,10 +738,9 @@ s16 ath9k_hw_getchan_noise(struct ath_hal *ah, struct ath9k_channel *chan)
 			chan->channel, chan->channelFlags);
 		return ATH_DEFAULT_NOISE_FLOOR;
 	}
-	if (ichan->rawNoiseFloor == 0) {
-		enum wireless_mode mode = ath9k_hw_chan2wmode(ah, chan);
-		nf = NOISE_FLOOR[mode];
-	} else
+	if (ichan->rawNoiseFloor == 0)
+		nf = -96;
+	else
 		nf = ichan->rawNoiseFloor;
 
 	if (!ath9k_hw_nf_in_range(ah, nf))