From: Felix Fietkau Date: Thu, 19 Apr 2012 19:18:28 +0000 (+0200) Subject: ath9k_hw: disable fast channel change when changing from/to half/quarter mode X-Git-Tag: for-linus-20120531~84^2~267^2^2~47 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=feb7bc9951246157cb9043b9886c7919b32d3cb9;p=linux-block.git ath9k_hw: disable fast channel change when changing from/to half/quarter mode Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index e576a92f18a3..75fd87f295d4 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1687,6 +1687,10 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan) if (chan->channel == ah->curchan->channel) goto fail; + if ((ah->curchan->channelFlags | chan->channelFlags) & + (CHANNEL_HALF | CHANNEL_QUARTER)) + goto fail; + if ((chan->channelFlags & CHANNEL_ALL) != (ah->curchan->channelFlags & CHANNEL_ALL)) goto fail;