diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-10-11 17:30:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-14 13:39:58 -0400 |
| commit | 81c507a8b09fe00a1b4a2e7e84ba7234b126c332 (patch) | |
| tree | 9a03109c2891f01c2ee3a419626a149e92187d44 | |
| parent | 1a5e63265f6dbd616596325d899332ddc506e83e (diff) | |
ath9k_hw: remove IS_CHAN_OFDM()
The hardware is always configured with OFDM support enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 34c8e2ebb69b..40a1132910f5 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
| @@ -1544,9 +1544,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah, | |||
| 1544 | ath9k_hw_set_clockrate(ah); | 1544 | ath9k_hw_set_clockrate(ah); |
| 1545 | ath9k_hw_apply_txpower(ah, chan, false); | 1545 | ath9k_hw_apply_txpower(ah, chan, false); |
| 1546 | 1546 | ||
| 1547 | if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan)) | 1547 | ath9k_hw_set_delta_slope(ah, chan); |
| 1548 | ath9k_hw_set_delta_slope(ah, chan); | ||
| 1549 | |||
| 1550 | ath9k_hw_spur_mitigate_freq(ah, chan); | 1548 | ath9k_hw_spur_mitigate_freq(ah, chan); |
| 1551 | 1549 | ||
| 1552 | if (band_switch || ini_reloaded) | 1550 | if (band_switch || ini_reloaded) |
| @@ -1981,9 +1979,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, | |||
| 1981 | 1979 | ||
| 1982 | ath9k_hw_init_mfp(ah); | 1980 | ath9k_hw_init_mfp(ah); |
| 1983 | 1981 | ||
| 1984 | if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan)) | 1982 | ath9k_hw_set_delta_slope(ah, chan); |
| 1985 | ath9k_hw_set_delta_slope(ah, chan); | ||
| 1986 | |||
| 1987 | ath9k_hw_spur_mitigate_freq(ah, chan); | 1983 | ath9k_hw_spur_mitigate_freq(ah, chan); |
| 1988 | ah->eep_ops->set_board_values(ah, chan); | 1984 | ah->eep_ops->set_board_values(ah, chan); |
| 1989 | 1985 | ||
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index eaaf98ba2509..0e446939b2d6 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
| @@ -445,7 +445,6 @@ struct ath9k_channel { | |||
| 445 | (((_c)->channelFlags & CHANNEL_G_HT20) == CHANNEL_G_HT20) || \ | 445 | (((_c)->channelFlags & CHANNEL_G_HT20) == CHANNEL_G_HT20) || \ |
| 446 | (((_c)->channelFlags & CHANNEL_G_HT40PLUS) == CHANNEL_G_HT40PLUS) || \ | 446 | (((_c)->channelFlags & CHANNEL_G_HT40PLUS) == CHANNEL_G_HT40PLUS) || \ |
| 447 | (((_c)->channelFlags & CHANNEL_G_HT40MINUS) == CHANNEL_G_HT40MINUS)) | 447 | (((_c)->channelFlags & CHANNEL_G_HT40MINUS) == CHANNEL_G_HT40MINUS)) |
| 448 | #define IS_CHAN_OFDM(_c) (((_c)->channelFlags & CHANNEL_OFDM) != 0) | ||
| 449 | #define IS_CHAN_5GHZ(_c) (((_c)->channelFlags & CHANNEL_5GHZ) != 0) | 448 | #define IS_CHAN_5GHZ(_c) (((_c)->channelFlags & CHANNEL_5GHZ) != 0) |
| 450 | #define IS_CHAN_2GHZ(_c) (((_c)->channelFlags & CHANNEL_2GHZ) != 0) | 449 | #define IS_CHAN_2GHZ(_c) (((_c)->channelFlags & CHANNEL_2GHZ) != 0) |
| 451 | #define IS_CHAN_HALF_RATE(_c) (((_c)->channelFlags & CHANNEL_HALF) != 0) | 450 | #define IS_CHAN_HALF_RATE(_c) (((_c)->channelFlags & CHANNEL_HALF) != 0) |
