--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -64,24 +64,36 @@ static s16 ath9k_hw_get_default_nf(struc
 }
 
 
+static u8 ath9k_hw_get_nfcal_chainmask(struct ath_hw *ah)
+{
+	struct ath_common *common = ath9k_hw_common(ah);
+	struct ieee80211_conf *conf = &common->hw->conf;
+	u8 chainmask = ah->rxchainmask;
+
+	if (!AR_SREV_9280_20_OR_LATER(ah))
+		chainmask = (1 << NUM_NF_READINGS) - 1;
+	else if (conf_is_ht40(conf))
+		chainmask |= chainmask << 3;
+
+	return chainmask;
+}
+
 static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah,
 					      struct ath9k_hw_cal_data *cal,
 					      int16_t *nfarray)
 {
 	struct ath_common *common = ath9k_hw_common(ah);
-	struct ieee80211_conf *conf = &common->hw->conf;
 	struct ath_nf_limits *limit;
 	struct ath9k_nfcal_hist *h;
 	bool high_nf_mid = false;
-	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
+	u8 chainmask = ath9k_hw_get_nfcal_chainmask(ah);
 	int i;
 
 	h = cal->nfCalHist;
 	limit = ath9k_hw_get_nf_limits(ah, ah->curchan);
 
 	for (i = 0; i < NUM_NF_READINGS; i++) {
-		if (!(chainmask & (1 << i)) ||
-		    ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
+		if (!(chainmask & (1 << i)))
 			continue;
 
 		h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
@@ -229,10 +241,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
 	struct ath9k_nfcal_hist *h = NULL;
 	unsigned i, j;
 	int32_t val;
-	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
 	struct ath_common *common = ath9k_hw_common(ah);
-	struct ieee80211_conf *conf = &common->hw->conf;
 	s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
+	u8 chainmask = ath9k_hw_get_nfcal_chainmask(ah);
 
 	if (ah->caldata)
 		h = ah->caldata->nfCalHist;
@@ -241,9 +252,6 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
 		if (chainmask & (1 << i)) {
 			s16 nfval;
 
-			if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-				continue;
-
 			if (h)
 				nfval = h[i].privNF;
 			else
@@ -303,9 +311,6 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
 	ENABLE_REGWRITE_BUFFER(ah);
 	for (i = 0; i < NUM_NF_READINGS; i++) {
 		if (chainmask & (1 << i)) {
-			if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-				continue;
-
 			val = REG_READ(ah, ah->nf_regs[i]);
 			val &= 0xFFFFFE00;
 			val |= (((u32) (-50) << 1) & 0x1ff);