diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-10-14 10:02:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 15:48:45 -0400 |
commit | d4659912b557e9f68c0ad8be14e2cafd3210dd16 (patch) | |
tree | 5bd3dbc2b7ba736ff1dc0717154e7b592a22c32f /drivers/net/wireless/ath/ath9k/hw.c | |
parent | 4e9900180eb72b3b22fc9742999045b11607eb24 (diff) |
ath9k_hw: remove enum wireless_mode and its users
The wireless mode bitfield was only used to detect 2.4 and 5 GHz support,
which can be simplified by using ATH9K_HW_CAP_* capabilities.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index f5d79177770..cc13ee11782 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1800,37 +1800,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) | |||
1800 | return -EINVAL; | 1800 | return -EINVAL; |
1801 | } | 1801 | } |
1802 | 1802 | ||
1803 | bitmap_zero(pCap->wireless_modes, ATH9K_MODE_MAX); | 1803 | if (eeval & AR5416_OPFLAGS_11A) |
1804 | 1804 | pCap->hw_caps |= ATH9K_HW_CAP_5GHZ; | |
1805 | if (eeval & AR5416_OPFLAGS_11A) { | ||
1806 | set_bit(ATH9K_MODE_11A, pCap->wireless_modes); | ||
1807 | if (ah->config.ht_enable) { | ||
1808 | if (!(eeval & AR5416_OPFLAGS_N_5G_HT20)) | ||
1809 | set_bit(ATH9K_MODE_11NA_HT20, | ||
1810 | pCap->wireless_modes); | ||
1811 | if (!(eeval & AR5416_OPFLAGS_N_5G_HT40)) { | ||
1812 | set_bit(ATH9K_MODE_11NA_HT40PLUS, | ||
1813 | pCap->wireless_modes); | ||
1814 | set_bit(ATH9K_MODE_11NA_HT40MINUS, | ||
1815 | pCap->wireless_modes); | ||
1816 | } | ||
1817 | } | ||
1818 | } | ||
1819 | 1805 | ||
1820 | if (eeval & AR5416_OPFLAGS_11G) { | 1806 | if (eeval & AR5416_OPFLAGS_11G) |
1821 | set_bit(ATH9K_MODE_11G, pCap->wireless_modes); | 1807 | pCap->hw_caps |= ATH9K_HW_CAP_2GHZ; |
1822 | if (ah->config.ht_enable) { | ||
1823 | if (!(eeval & AR5416_OPFLAGS_N_2G_HT20)) | ||
1824 | set_bit(ATH9K_MODE_11NG_HT20, | ||
1825 | pCap->wireless_modes); | ||
1826 | if (!(eeval & AR5416_OPFLAGS_N_2G_HT40)) { | ||
1827 | set_bit(ATH9K_MODE_11NG_HT40PLUS, | ||
1828 | pCap->wireless_modes); | ||
1829 | set_bit(ATH9K_MODE_11NG_HT40MINUS, | ||
1830 | pCap->wireless_modes); | ||
1831 | } | ||
1832 | } | ||
1833 | } | ||
1834 | 1808 | ||
1835 | pCap->tx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_TX_MASK); | 1809 | pCap->tx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_TX_MASK); |
1836 | /* | 1810 | /* |