diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-10-08 14:06:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 16:41:27 -0400 |
commit | cd2ea0df6892893c9a47b55f37a4d73736221a39 (patch) | |
tree | b0a51284d6c607cd482d5952b7f6c5a84392a3c5 /drivers | |
parent | ca2c68cc7bc80fc4504fb420df04cce99c9ee6ec (diff) |
ath: remove ath_regulatory::current_rd_ext
It is unused since the previous dead code that was using it had been
removed earlier.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index bb71b4f27a9b..908fdbc3e0ee 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h | |||
@@ -72,7 +72,6 @@ struct ath_regulatory { | |||
72 | u16 country_code; | 72 | u16 country_code; |
73 | u16 max_power_level; | 73 | u16 max_power_level; |
74 | u16 current_rd; | 74 | u16 current_rd; |
75 | u16 current_rd_ext; | ||
76 | int16_t power_limit; | 75 | int16_t power_limit; |
77 | struct reg_dmn_pair_mapping *regpair; | 76 | struct reg_dmn_pair_mapping *regpair; |
78 | }; | 77 | }; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 949656d928d3..fd7c2077dfd4 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -2072,11 +2072,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) | |||
2072 | eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_0); | 2072 | eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_0); |
2073 | regulatory->current_rd = eeval; | 2073 | regulatory->current_rd = eeval; |
2074 | 2074 | ||
2075 | eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_1); | ||
2076 | if (AR_SREV_9285_12_OR_LATER(ah)) | ||
2077 | eeval |= AR9285_RDEXT_DEFAULT; | ||
2078 | regulatory->current_rd_ext = eeval; | ||
2079 | |||
2080 | if (ah->opmode != NL80211_IFTYPE_AP && | 2075 | if (ah->opmode != NL80211_IFTYPE_AP && |
2081 | ah->hw_version.subvendorid == AR_SUBVENDOR_ID_NEW_A) { | 2076 | ah->hw_version.subvendorid == AR_SUBVENDOR_ID_NEW_A) { |
2082 | if (regulatory->current_rd == 0x64 || | 2077 | if (regulatory->current_rd == 0x64 || |
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index beca71073e9b..f06e0695d412 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c | |||
@@ -1896,7 +1896,6 @@ static int carl9170_parse_eeprom(struct ar9170 *ar) | |||
1896 | ar->hw->channel_change_time = 80 * 1000; | 1896 | ar->hw->channel_change_time = 80 * 1000; |
1897 | 1897 | ||
1898 | regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]); | 1898 | regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]); |
1899 | regulatory->current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]); | ||
1900 | 1899 | ||
1901 | /* second part of wiphy init */ | 1900 | /* second part of wiphy init */ |
1902 | SET_IEEE80211_PERM_ADDR(ar->hw, ar->eeprom.mac_address); | 1901 | SET_IEEE80211_PERM_ADDR(ar->hw, ar->eeprom.mac_address); |