diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c index 815bee21c19a..0ac1b5f04256 100644 --- a/drivers/net/wireless/ath/ath9k/mci.c +++ b/drivers/net/wireless/ath/ath9k/mci.c | |||
@@ -661,9 +661,9 @@ void ath9k_mci_update_wlan_channels(struct ath_softc *sc, bool allow_all) | |||
661 | chan_start = wlan_chan - 10; | 661 | chan_start = wlan_chan - 10; |
662 | chan_end = wlan_chan + 10; | 662 | chan_end = wlan_chan + 10; |
663 | 663 | ||
664 | if (chan->chanmode == CHANNEL_G_HT40PLUS) | 664 | if (IS_CHAN_HT40PLUS(chan)) |
665 | chan_end += 20; | 665 | chan_end += 20; |
666 | else if (chan->chanmode == CHANNEL_G_HT40MINUS) | 666 | else if (IS_CHAN_HT40MINUS(chan)) |
667 | chan_start -= 20; | 667 | chan_start -= 20; |
668 | 668 | ||
669 | /* adjust side band */ | 669 | /* adjust side band */ |
@@ -707,11 +707,11 @@ void ath9k_mci_set_txpower(struct ath_softc *sc, bool setchannel, | |||
707 | 707 | ||
708 | if (setchannel) { | 708 | if (setchannel) { |
709 | struct ath9k_hw_cal_data *caldata = &sc->caldata; | 709 | struct ath9k_hw_cal_data *caldata = &sc->caldata; |
710 | if ((caldata->chanmode == CHANNEL_G_HT40PLUS) && | 710 | if (IS_CHAN_HT40PLUS(ah->curchan) && |
711 | (ah->curchan->channel > caldata->channel) && | 711 | (ah->curchan->channel > caldata->channel) && |
712 | (ah->curchan->channel <= caldata->channel + 20)) | 712 | (ah->curchan->channel <= caldata->channel + 20)) |
713 | return; | 713 | return; |
714 | if ((caldata->chanmode == CHANNEL_G_HT40MINUS) && | 714 | if (IS_CHAN_HT40MINUS(ah->curchan) && |
715 | (ah->curchan->channel < caldata->channel) && | 715 | (ah->curchan->channel < caldata->channel) && |
716 | (ah->curchan->channel >= caldata->channel - 20)) | 716 | (ah->curchan->channel >= caldata->channel - 20)) |
717 | return; | 717 | return; |