From cc721992a24ffadc9bd25a0fa4e8a5b4a91be029 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Thu, 17 Sep 2009 09:27:10 +0530 Subject: [PATCH] --- yaml --- r: 166287 b: refs/heads/master c: 0a475cc6a0ac8e38ac3587cff87026551800b7fe h: refs/heads/master i: 166285: 0e2854c43211acce72ff255a797d4ef1bdc654bd 166283: 7964ce52334d109f1416abd5daecdbda8d504f92 166279: 7db0acbe1d29260dbb44e0d02b08edeab77b41df 166271: 06fccff4f8ca60597efc65a14cc32a1b65d29a85 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d51e1aa72e4c..c7916c7f0169 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ebef7997d0c131a8d53c045bff68becddd58124 +refs/heads/master: 0a475cc6a0ac8e38ac3587cff87026551800b7fe diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c index 2c904c6e2099..323df96dad0b 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hw.c +++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c @@ -2366,8 +2366,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, (chan->channel != ah->curchan->channel) && ((chan->channelFlags & CHANNEL_ALL) == (ah->curchan->channelFlags & CHANNEL_ALL)) && - (!AR_SREV_9280(ah) || (!IS_CHAN_A_5MHZ_SPACED(chan) && - !IS_CHAN_A_5MHZ_SPACED(ah->curchan)))) { + !(AR_SREV_9280(ah) || IS_CHAN_A_5MHZ_SPACED(chan) || + IS_CHAN_A_5MHZ_SPACED(ah->curchan))) { if (ath9k_hw_channel_change(ah, chan, sc->tx_chan_width)) { ath9k_hw_loadnf(ah, ah->curchan);