diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-23 13:29:16 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:49:37 -0400 |
| commit | 27babf9f470b5e75763703626cae710a30bf703d (patch) | |
| tree | c705577e90ab5394ede2db1d04caea92acbc1c21 /drivers/net/wireless/ath/ath9k/recv.c | |
| parent | 922c943dcc48fc0085daeaa3e8038c5446f226c2 (diff) | |
| download | lwn-27babf9f470b5e75763703626cae710a30bf703d.tar.gz lwn-27babf9f470b5e75763703626cae710a30bf703d.zip | |
ath9k: Fix channel context events
Check if channel context usage is enabled before
calling ath_chanctx_event() from various parts of the
driver. Also, make sure that ath_chanctx_event() is
compiled 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/recv.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index ae0d1e913690..cc91749035cf 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -892,9 +892,12 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc, return -EINVAL; } - if (rx_stats->is_mybeacon) { - sc->sched.next_tbtt = rx_stats->rs_tstamp; - ath_chanctx_event(sc, NULL, ATH_CHANCTX_EVENT_BEACON_RECEIVED); + if (ath9k_is_chanctx_enabled()) { + if (rx_stats->is_mybeacon) { + sc->sched.next_tbtt = rx_stats->rs_tstamp; + ath_chanctx_event(sc, NULL, + ATH_CHANCTX_EVENT_BEACON_RECEIVED); + } } ath9k_cmn_process_rssi(common, hw, rx_stats, rx_status); |