Commit 8e92d3f2 authored by Zefir Kurtisi's avatar Zefir Kurtisi Committed by John W. Linville
Browse files

ath9k: add DFS pattern detector instance to ath_softc 



Signed-off-by: default avatarZefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6ee159e2

drivers/net/wireless/ath/ath9k/ath9k.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/ath9k/init.c

+4 −0
Original line number Diff line number Diff line
@@ -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;