From: Sujith Manoharan Date: Mon, 15 Sep 2014 05:55:51 +0000 (+0530) Subject: ath9k: Check beaconing mode properly X-Git-Tag: v3.18-rc1~115^2~144^2~15 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7f30eac9938daf12e34334c8eb1f8fba37fc7ace;p=~emulex%2Finfiniband.git ath9k: Check beaconing mode properly In MCC mode, the TSF of a context needs to be adjusted only if it is GO/AP. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c index e2712b08c79..77c99eb5583 100644 --- a/drivers/net/wireless/ath/ath9k/channel.c +++ b/drivers/net/wireless/ath/ath9k/channel.c @@ -260,6 +260,9 @@ static void ath_chanctx_adjust_tbtt_delta(struct ath_softc *sc) cur = sc->cur_chan; prev = ath_chanctx_get_next(sc, cur); + if (!prev->switch_after_beacon) + return; + getrawmonotonic(&ts); cur_tsf = (u32) cur->tsf_val + ath9k_hw_get_tsf_offset(&cur->tsf_ts, &ts);