aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZefir Kurtisi <zefir.kurtisi@neratec.com>2012-04-03 11:15:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-11 16:23:53 -0400
commit8e92d3f24234b467f95276db99a55e1244d14afb (patch)
treea1b9fa1edcd1c0dc107da6a4542be8155faf1315 /drivers
parent6ee159e26f1bb0177b37ebc858693932465839a3 (diff)
ath9k: add DFS pattern detector instance to ath_softc
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/ath9k.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 0792d87558ef..0a37631390db 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -26,6 +26,7 @@
26#include "debug.h" 26#include "debug.h"
27#include "common.h" 27#include "common.h"
28#include "mci.h" 28#include "mci.h"
29#include "dfs.h"
29 30
30/* 31/*
31 * Header for the ath9k.ko driver core *only* -- hw code nor any other driver 32 * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
@@ -683,6 +684,7 @@ struct ath_softc {
683 684
684 struct ath_ant_comb ant_comb; 685 struct ath_ant_comb ant_comb;
685 u8 ant_tx, ant_rx; 686 u8 ant_tx, ant_rx;
687 struct dfs_pattern_detector *dfs_detector;
686}; 688};
687 689
688void ath9k_tasklet(unsigned long data); 690void ath9k_tasklet(unsigned long data);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index daaa86f2463b..7a6b9f69a7b1 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -521,6 +521,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
521 atomic_set(&ah->intr_ref_cnt, -1); 521 atomic_set(&ah->intr_ref_cnt, -1);
522 sc->sc_ah = ah; 522 sc->sc_ah = ah;
523 523
524 sc->dfs_detector = dfs_pattern_detector_init(NL80211_DFS_UNSET);
525
524 if (!pdata) { 526 if (!pdata) {
525 ah->ah_flags |= AH_USE_EEPROM; 527 ah->ah_flags |= AH_USE_EEPROM;
526 sc->sc_ah->led_pin = -1; 528 sc->sc_ah->led_pin = -1;
@@ -825,6 +827,8 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
825 ath_tx_cleanupq(sc, &sc->tx.txq[i]); 827 ath_tx_cleanupq(sc, &sc->tx.txq[i]);
826 828
827 ath9k_hw_deinit(sc->sc_ah); 829 ath9k_hw_deinit(sc->sc_ah);
830 if (sc->dfs_detector != NULL)
831 sc->dfs_detector->exit(sc->dfs_detector);
828 832
829 kfree(sc->sc_ah); 833 kfree(sc->sc_ah);
830 sc->sc_ah = NULL; 834 sc->sc_ah = NULL;