|
@@ -1499,14 +1499,16 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
|
}
|
|
}
|
|
ah->noise = ath9k_hw_getchan_noise(ah, chan);
|
|
ah->noise = ath9k_hw_getchan_noise(ah, chan);
|
|
|
|
|
|
|
|
+ if ((AR_SREV_9280(ah) && common->bus_ops->ath_bus_type == ATH_PCI) ||
|
|
|
|
+ (AR_SREV_9300_20_OR_LATER(ah) && IS_CHAN_5GHZ(chan)))
|
|
|
|
+ bChannelChange = false;
|
|
|
|
+
|
|
if (bChannelChange &&
|
|
if (bChannelChange &&
|
|
(ah->chip_fullsleep != true) &&
|
|
(ah->chip_fullsleep != true) &&
|
|
(ah->curchan != NULL) &&
|
|
(ah->curchan != NULL) &&
|
|
(chan->channel != ah->curchan->channel) &&
|
|
(chan->channel != ah->curchan->channel) &&
|
|
((chan->channelFlags & CHANNEL_ALL) ==
|
|
((chan->channelFlags & CHANNEL_ALL) ==
|
|
- (ah->curchan->channelFlags & CHANNEL_ALL)) &&
|
|
|
|
- (!AR_SREV_9280(ah) || AR_DEVID_7010(ah))) {
|
|
|
|
-
|
|
|
|
|
|
+ (ah->curchan->channelFlags & CHANNEL_ALL))) {
|
|
if (ath9k_hw_channel_change(ah, chan)) {
|
|
if (ath9k_hw_channel_change(ah, chan)) {
|
|
ath9k_hw_loadnf(ah, ah->curchan);
|
|
ath9k_hw_loadnf(ah, ah->curchan);
|
|
ath9k_hw_start_nfcal(ah, true);
|
|
ath9k_hw_start_nfcal(ah, true);
|