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>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 02664b3c7c5259c3b1c3da66dfb7ff4ceda7d290..a2f4fa78ce76697b8258f9e36e381cfd801df4ed 100644 (file)
--- 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