From 3432b6b2313741777e26d03ac0c7c04f71bea0b6 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Thu, 15 Apr 2010 17:39:25 -0400
Subject: [PATCH] --- yaml --- r: 194435 b: refs/heads/master c:
 d8903a5361817bd96ceed212ad27a380e7ef4d8e h: refs/heads/master i:   194433:
 14ab51cc876222d08d1caccec197f1d4f2b301c3   194431:
 bfcaf5091c111b18294f0e5dd59224cb15596eea v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/hw.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a3415a2c6964..a6b41b34ae95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c94fdc97a27bd681afeaf05d9101b3f9a06f986
+refs/heads/master: d8903a5361817bd96ceed212ad27a380e7ef4d8e
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index a6f8032e54d6..824dd9e72564 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1324,6 +1324,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 	if (ah->btcoex_hw.enabled)
 		ath9k_hw_btcoex_enable(ah);
 
+	if (AR_SREV_9300_20_OR_LATER(ah)) {
+		ath9k_hw_loadnf(ah, curchan);
+		ath9k_hw_start_nfcal(ah);
+	}
+
 	return 0;
 }
 EXPORT_SYMBOL(ath9k_hw_reset);