Skip to content

Commit

Permalink
ath9k: add DFS pattern detector instance to ath_softc
Browse files Browse the repository at this point in the history
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Zefir Kurtisi authored and John W. Linville committed Apr 11, 2012
1 parent 6ee159e commit 8e92d3f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/net/wireless/ath/ath9k/ath9k.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions drivers/net/wireless/ath/ath9k/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8e92d3f

Please sign in to comment.