diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-22 20:39:30 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:41:58 -0400 |
| commit | c7dd40c92af1f28b84995a07aa88ccd3068ee4de (patch) | |
| tree | 02a2f8601c99a8000fad0165a02bb9c83ab5f0d8 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | 2471adff1f085ec049358f16dcbc97ca7f29d2ef (diff) | |
| download | linux-c7dd40c92af1f28b84995a07aa88ccd3068ee4de.tar.bz2 | |
ath9k: Isolate P2P powersave routines
Use CONFIG_ATH9K_CHANNEL_CONTEXT to conditionally
compile P2P-PS code.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 4219e7bd4759..5c48be95f983 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -600,9 +600,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, if (ret) goto err_btcoex; - sc->p2p_ps_timer = ath_gen_timer_alloc(sc->sc_ah, ath9k_p2p_ps_timer, - NULL, sc, AR_FIRST_NDP_TIMER); - if (!sc->p2p_ps_timer) + ret = ath9k_init_p2p(sc); + if (ret) goto err_btcoex; ath9k_cmn_init_crypto(sc->sc_ah); @@ -919,9 +918,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc) { int i = 0; - if (sc->p2p_ps_timer) - ath_gen_timer_free(sc->sc_ah, sc->p2p_ps_timer); - + ath9k_deinit_p2p(sc); ath9k_deinit_btcoex(sc); for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) |