From a199047591627efff8f0cda0b8b790fc8411b098 Mon Sep 17 00:00:00 2001
From: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Date: Tue, 3 Apr 2012 17:15:50 +0200
Subject: [PATCH] --- yaml --- r: 300703 b: refs/heads/master c:
 8e92d3f24234b467f95276db99a55e1244d14afb h: refs/heads/master i:   300701:
 b89212bf13bd37ac483638a149451c136bb40a1b   300699:
 22bcaf014b3385c9e3db6dd4c0a19d20e3561466   300695:
 c0b344a36990d10c5f0c696996e9b2e285614695   300687:
 49ec35f70e10904aa80f046934bad1b0b57fa7f6   300671:
 74be49a5d28cb33bab28a6dae1d2b92fdc30bb29 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/ath9k.h | 2 ++
 trunk/drivers/net/wireless/ath/ath9k/init.c  | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1bf09e6c8a7..5b361a2755e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee159e26f1bb0177b37ebc858693932465839a3
+refs/heads/master: 8e92d3f24234b467f95276db99a55e1244d14afb
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
index 0792d87558ef..0a37631390db 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -26,6 +26,7 @@
 #include "debug.h"
 #include "common.h"
 #include "mci.h"
+#include "dfs.h"
 
 /*
  * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
@@ -683,6 +684,7 @@ struct ath_softc {
 
 	struct ath_ant_comb ant_comb;
 	u8 ant_tx, ant_rx;
+	struct dfs_pattern_detector *dfs_detector;
 };
 
 void ath9k_tasklet(unsigned long data);
diff --git a/trunk/drivers/net/wireless/ath/ath9k/init.c b/trunk/drivers/net/wireless/ath/ath9k/init.c
index daaa86f2463b..7a6b9f69a7b1 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/init.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/init.c
@@ -521,6 +521,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 	atomic_set(&ah->intr_ref_cnt, -1);
 	sc->sc_ah = ah;
 
+	sc->dfs_detector = dfs_pattern_detector_init(NL80211_DFS_UNSET);
+
 	if (!pdata) {
 		ah->ah_flags |= AH_USE_EEPROM;
 		sc->sc_ah->led_pin = -1;
@@ -825,6 +827,8 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 			ath_tx_cleanupq(sc, &sc->tx.txq[i]);
 
 	ath9k_hw_deinit(sc->sc_ah);
+	if (sc->dfs_detector != NULL)
+		sc->dfs_detector->exit(sc->dfs_detector);
 
 	kfree(sc->sc_ah);
 	sc->sc_ah = NULL;