Commit fb02e95c authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

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: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 77843167
...@@ -324,6 +324,10 @@ struct ath_rx { ...@@ -324,6 +324,10 @@ struct ath_rx {
u32 ampdu_ref; u32 ampdu_ref;
}; };
/*******************/
/* Channel Context */
/*******************/
struct ath_chanctx { struct ath_chanctx {
struct cfg80211_chan_def chandef; struct cfg80211_chan_def chandef;
struct list_head vifs; struct list_head vifs;
...@@ -917,15 +921,16 @@ struct ath_softc { ...@@ -917,15 +921,16 @@ struct ath_softc {
struct mutex mutex; struct mutex mutex;
struct work_struct paprd_work; struct work_struct paprd_work;
struct work_struct hw_reset_work; struct work_struct hw_reset_work;
struct work_struct chanctx_work;
struct completion paprd_complete; struct completion paprd_complete;
wait_queue_head_t tx_wait; wait_queue_head_t tx_wait;
#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT #ifdef CONFIG_ATH9K_CHANNEL_CONTEXT
struct work_struct chanctx_work;
struct ath_gen_timer *p2p_ps_timer; struct ath_gen_timer *p2p_ps_timer;
struct ath_vif *p2p_ps_vif; struct ath_vif *p2p_ps_vif;
struct ath_chanctx_sched sched; struct ath_chanctx_sched sched;
struct ath_offchannel offchannel; struct ath_offchannel offchannel;
struct ath_chanctx *next_chan;
#endif #endif
unsigned long driver_data; unsigned long driver_data;
...@@ -947,7 +952,6 @@ struct ath_softc { ...@@ -947,7 +952,6 @@ struct ath_softc {
struct cfg80211_chan_def cur_chandef; struct cfg80211_chan_def cur_chandef;
struct ath_chanctx chanctx[ATH9K_NUM_CHANCTX]; struct ath_chanctx chanctx[ATH9K_NUM_CHANCTX];
struct ath_chanctx *cur_chan; struct ath_chanctx *cur_chan;
struct ath_chanctx *next_chan;
spinlock_t chan_lock; spinlock_t chan_lock;
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_MAC80211_LEDS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment