ath9k_hw: disable fast channel change when changing from/to half/quarter mode

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index e576a92f18a33830d64458649299a0fc632aa7ea..75fd87f295d4fb27214c497d8c967d870b9f2f68 100644 (file)
--- 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;