---

yaml
---
r: 300703
b: refs/heads/master
c: 8e92d3f
h: refs/heads/master
i:
  300701: b89212b
  300699: 22bcaf0
  300695: c0b344a
  300687: 49ec35f
  300671: 74be49a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee159e26f1bb0177b37ebc858693932465839a3
+refs/heads/master: 8e92d3f24234b467f95276db99a55e1244d14afb

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);

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;