diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-23 09:42:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:49:38 -0400 |
commit | 6e47fafbc38a93797f86413db8eea3e9319ebbd0 (patch) | |
tree | 0189c9a65dd95786cb626776c545d5b45b80ac1d /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | 11e39a4e054cde1aaa9f5d3830f41f86818602fd (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.h | 14 |
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 | ||
416 | void ath_chanctx_init(struct ath_softc *sc); | ||
417 | void 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 | |||
416 | static inline struct ath_chanctx * | 422 | static inline struct ath_chanctx * |
417 | ath_chanctx_get(struct ieee80211_chanctx_conf *ctx) | 423 | ath_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 | } |
422 | void ath_chanctx_init(struct ath_softc *sc); | 428 | |
423 | void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx, | ||
424 | struct cfg80211_chan_def *chandef); | ||
425 | #ifdef CONFIG_ATH9K_CHANNEL_CONTEXT | ||
426 | bool ath9k_is_chanctx_enabled(void); | 429 | bool ath9k_is_chanctx_enabled(void); |
427 | void ath9k_fill_chanctx_ops(void); | 430 | void ath9k_fill_chanctx_ops(void); |
428 | void ath9k_init_channel_context(struct ath_softc *sc); | 431 | void ath9k_init_channel_context(struct ath_softc *sc); |
@@ -451,7 +454,9 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force); | |||
451 | void ath_offchannel_next(struct ath_softc *sc); | 454 | void ath_offchannel_next(struct ath_softc *sc); |
452 | void ath_scan_complete(struct ath_softc *sc, bool abort); | 455 | void ath_scan_complete(struct ath_softc *sc, bool abort); |
453 | void ath_roc_complete(struct ath_softc *sc, bool abort); | 456 | void ath_roc_complete(struct ath_softc *sc, bool abort); |
457 | |||
454 | #else | 458 | #else |
459 | |||
455 | static inline bool ath9k_is_chanctx_enabled(void) | 460 | static 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 | ||
518 | int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan); | 524 | int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan); |