diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-03-23 15:57:30 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-30 14:15:20 -0400 |
commit | c429bdcf8fe033f04830a960e07c13a01f631499 (patch) | |
tree | 3502807e2dbb2ca77a612f6f5e65d1b88e23ba1c | |
parent | 0db156e9648e69c34e8e88328358a26611fd71e3 (diff) |
ath9k_hw: remove pCap->reg_cap
It is not used anywhere and seems pointless
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 | 17 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 625ad0bcdc1f..be2257469ab5 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1932,23 +1932,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) | |||
1932 | else | 1932 | else |
1933 | pCap->hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS; | 1933 | pCap->hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS; |
1934 | 1934 | ||
1935 | if (regulatory->current_rd_ext & (1 << REG_EXT_JAPAN_MIDBAND)) { | ||
1936 | pCap->reg_cap = | ||
1937 | AR_EEPROM_EEREGCAP_EN_KK_NEW_11A | | ||
1938 | AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN | | ||
1939 | AR_EEPROM_EEREGCAP_EN_KK_U2 | | ||
1940 | AR_EEPROM_EEREGCAP_EN_KK_MIDBAND; | ||
1941 | } else { | ||
1942 | pCap->reg_cap = | ||
1943 | AR_EEPROM_EEREGCAP_EN_KK_NEW_11A | | ||
1944 | AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN; | ||
1945 | } | ||
1946 | |||
1947 | /* Advertise midband for AR5416 with FCC midband set in eeprom */ | ||
1948 | if (regulatory->current_rd_ext & (1 << REG_EXT_FCC_MIDBAND) && | ||
1949 | AR_SREV_5416(ah)) | ||
1950 | pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND; | ||
1951 | |||
1952 | if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) { | 1935 | if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) { |
1953 | btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO; | 1936 | btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO; |
1954 | btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO; | 1937 | btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 7bbf7015af13..a255f9a0a698 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -200,7 +200,6 @@ struct ath9k_hw_capabilities { | |||
200 | u8 max_txchains; | 200 | u8 max_txchains; |
201 | u8 max_rxchains; | 201 | u8 max_rxchains; |
202 | u16 tx_triglevel_max; | 202 | u16 tx_triglevel_max; |
203 | u16 reg_cap; | ||
204 | u8 num_gpio_pins; | 203 | u8 num_gpio_pins; |
205 | u8 rx_hp_qdepth; | 204 | u8 rx_hp_qdepth; |
206 | u8 rx_lp_qdepth; | 205 | u8 rx_lp_qdepth; |