diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-23 17:42:13 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 22:49:38 +0400 |
| commit | fb02e95c9b3d76b658288af0c8a362c85f9d6d44 (patch) | |
| tree | 73c6963184df92b2b4b0f8badeaa832c11391f29 /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | 77843167a926a1b11dff812f027fc56930948c1b (diff) | |
| download | linux-fb02e95c9b3d76b658288af0c8a362c85f9d6d44.tar.xz | |
ath9k: Fix channel context variables in ath_softc
chanctx_work and next_chan are required only when
CONFIG_ATH9K_CHANNEL_CONTEXT is enabled.
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 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 02664b3c7c52..a2f4fa78ce76 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -324,6 +324,10 @@ struct ath_rx { u32 ampdu_ref; }; +/*******************/ +/* Channel Context */ +/*******************/ + struct ath_chanctx { struct cfg80211_chan_def chandef; struct list_head vifs; @@ -917,15 +921,16 @@ struct ath_softc { struct mutex mutex; struct work_struct paprd_work; struct work_struct hw_reset_work; - struct work_struct chanctx_work; struct completion paprd_complete; wait_queue_head_t tx_wait; #ifdef CONFIG_ATH9K_CHANNEL_CONTEXT + struct work_struct chanctx_work; struct ath_gen_timer *p2p_ps_timer; struct ath_vif *p2p_ps_vif; struct ath_chanctx_sched sched; struct ath_offchannel offchannel; + struct ath_chanctx *next_chan; #endif unsigned long driver_data; @@ -947,7 +952,6 @@ struct ath_softc { struct cfg80211_chan_def cur_chandef; struct ath_chanctx chanctx[ATH9K_NUM_CHANCTX]; struct ath_chanctx *cur_chan; - struct ath_chanctx *next_chan; spinlock_t chan_lock; #ifdef CONFIG_MAC80211_LEDS |