aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ath9k.h
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2014-08-23 09:42:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-08-28 14:49:38 -0400
commit6e47fafbc38a93797f86413db8eea3e9319ebbd0 (patch)
tree0189c9a65dd95786cb626776c545d5b45b80ac1d /drivers/net/wireless/ath/ath9k/ath9k.h
parent11e39a4e054cde1aaa9f5d3830f41f86818602fd (diff)
ath9k: Fix ath_chanctx_get()
Move it inside a CONFIG_ATH9K_CHANNEL_CONTEXT ifdef since it is not needed otherwise. 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/ath9k.h')
-rw-r--r--drivers/net/wireless/ath/ath9k/ath9k.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 9e61679b3de2..acbe2b7956ae 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -413,16 +413,19 @@ struct ath_offchannel {
413 ctx <= &sc->chanctx[ARRAY_SIZE(sc->chanctx) - 1]; \ 413 ctx <= &sc->chanctx[ARRAY_SIZE(sc->chanctx) - 1]; \
414 ctx++) 414 ctx++)
415 415
416void ath_chanctx_init(struct ath_softc *sc);
417void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
418 struct cfg80211_chan_def *chandef);
419
420#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT
421
416static inline struct ath_chanctx * 422static inline struct ath_chanctx *
417ath_chanctx_get(struct ieee80211_chanctx_conf *ctx) 423ath_chanctx_get(struct ieee80211_chanctx_conf *ctx)
418{ 424{
419 struct ath_chanctx **ptr = (void *) ctx->drv_priv; 425 struct ath_chanctx **ptr = (void *) ctx->drv_priv;
420 return *ptr; 426 return *ptr;
421} 427}
422void ath_chanctx_init(struct ath_softc *sc); 428
423void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
424 struct cfg80211_chan_def *chandef);
425#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT
426bool ath9k_is_chanctx_enabled(void); 429bool ath9k_is_chanctx_enabled(void);
427void ath9k_fill_chanctx_ops(void); 430void ath9k_fill_chanctx_ops(void);
428void ath9k_init_channel_context(struct ath_softc *sc); 431void ath9k_init_channel_context(struct ath_softc *sc);
@@ -451,7 +454,9 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force);
451void ath_offchannel_next(struct ath_softc *sc); 454void ath_offchannel_next(struct ath_softc *sc);
452void ath_scan_complete(struct ath_softc *sc, bool abort); 455void ath_scan_complete(struct ath_softc *sc, bool abort);
453void ath_roc_complete(struct ath_softc *sc, bool abort); 456void ath_roc_complete(struct ath_softc *sc, bool abort);
457
454#else 458#else
459
455static inline bool ath9k_is_chanctx_enabled(void) 460static inline bool ath9k_is_chanctx_enabled(void)
456{ 461{
457 return false; 462 return false;
@@ -513,6 +518,7 @@ static inline void ath_chanctx_check_active(struct ath_softc *sc,
513 struct ath_chanctx *ctx) 518 struct ath_chanctx *ctx)
514{ 519{
515} 520}
521
516#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */ 522#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */
517 523
518int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan); 524int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan);