leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: add DFS pattern detector instance to ath_softc

Browse Source 
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zefir Kurtisi 2012-04-03 17:15:50 +02:00 committed by John W. Linville
parent 6ee159e26f
commit 8e92d3f242
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -26,6 +26,7 @@
#include "debug.h" #include "debug.h"
#include "common.h" #include "common.h"
#include "mci.h" #include "mci.h"
#include "dfs.h"
/* /*
* Header for the ath9k.ko driver core *only* -- hw code nor any other driver * 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; struct ath_ant_comb ant_comb;
u8 ant_tx, ant_rx; u8 ant_tx, ant_rx;
struct dfs_pattern_detector *dfs_detector;
}; };
void ath9k_tasklet(unsigned long data); void ath9k_tasklet(unsigned long data);

4
drivers/net/wireless/ath/ath9k/init.c
View File

@ -521,6 +521,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
atomic_set(&ah->intr_ref_cnt, -1); atomic_set(&ah->intr_ref_cnt, -1);
sc->sc_ah = ah; sc->sc_ah = ah;
sc->dfs_detector = dfs_pattern_detector_init(NL80211_DFS_UNSET);
if (!pdata) { if (!pdata) {
ah->ah_flags |= AH_USE_EEPROM; ah->ah_flags |= AH_USE_EEPROM;
sc->sc_ah->led_pin = -1; 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]); ath_tx_cleanupq(sc, &sc->tx.txq[i]);
ath9k_hw_deinit(sc->sc_ah); ath9k_hw_deinit(sc->sc_ah);
if (sc->dfs_detector != NULL)
sc->dfs_detector->exit(sc->dfs_detector);
kfree(sc->sc_ah); kfree(sc->sc_ah);
sc->sc_ah = NULL; sc->sc_ah = NULL;