diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-09-17 16:02:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-17 16:02:56 +0000 |
| commit | e327db6d62323855680731cec8275d26df90ce7e (patch) | |
| tree | e78735e10fd19a35d9a6966e23fcc6cf20eaff9c /package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch | |
| parent | b87111b121dee11a57bb8a2d184d3bb8b1c36175 (diff) | |
| download | upstream-e327db6d62323855680731cec8275d26df90ce7e.tar.gz upstream-e327db6d62323855680731cec8275d26df90ce7e.tar.bz2 upstream-e327db6d62323855680731cec8275d26df90ce7e.zip | |
ath9k: add some cleanup patches and rework tx power handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28253 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch')
| -rw-r--r-- | package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch b/package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch new file mode 100644 index 0000000000..c2f61c2582 --- /dev/null +++ b/package/mac80211/patches/582-ath9k_remove_current_rd_ext.patch @@ -0,0 +1,34 @@ +--- a/drivers/net/wireless/ath/ath.h ++++ b/drivers/net/wireless/ath/ath.h +@@ -72,7 +72,6 @@ struct ath_regulatory { + u16 country_code; + u16 max_power_level; + u16 current_rd; +- u16 current_rd_ext; + int16_t power_limit; + struct reg_dmn_pair_mapping *regpair; + }; +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -2047,11 +2047,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw + eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_0); + regulatory->current_rd = eeval; + +- eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_1); +- if (AR_SREV_9285_12_OR_LATER(ah)) +- eeval |= AR9285_RDEXT_DEFAULT; +- regulatory->current_rd_ext = eeval; +- + if (ah->opmode != NL80211_IFTYPE_AP && + ah->hw_version.subvendorid == AR_SUBVENDOR_ID_NEW_A) { + if (regulatory->current_rd == 0x64 || +--- a/drivers/net/wireless/ath/carl9170/main.c ++++ b/drivers/net/wireless/ath/carl9170/main.c +@@ -1912,7 +1912,6 @@ static int carl9170_parse_eeprom(struct + ar->hw->channel_change_time = 80 * 1000; + + regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]); +- regulatory->current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]); + + /* second part of wiphy init */ + SET_IEEE80211_PERM_ADDR(ar->hw, ar->eeprom.mac_address); |