X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F201-ath5k_eeprom.patch;h=b42110d9bf11bdbc7117c1b619b18b14c5c47ab9;hb=06452459df6022ed1f3c274d07e6493fc785f5a2;hp=5dfbcf3be9a2fdeb3a500a907304a36b765d2fe5;hpb=7f22b71ae0336f66638dcb3083a08bef1bf0e0ec;p=15.05%2Fopenwrt.git

diff --git a/package/mac80211/patches/201-ath5k_eeprom.patch b/package/mac80211/patches/201-ath5k_eeprom.patch
index 5dfbcf3be9..b42110d9bf 100644
--- a/package/mac80211/patches/201-ath5k_eeprom.patch
+++ b/package/mac80211/patches/201-ath5k_eeprom.patch
@@ -23,25 +23,25 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
 -		freq1 = (val >> 8) & 0xff;
 -		freq2 = val & 0xff;
--
--		if (freq1) {
--			pc[i++].freq = ath5k_eeprom_bin2freq(ee,
--					freq1, mode);
--			ee->ee_n_piers[mode]++;
--		}
 +		freq1 = val & 0xff;
 +		if (!freq1)
 +			break;
  
--		if (freq2) {
+-		if (freq1) {
 -			pc[i++].freq = ath5k_eeprom_bin2freq(ee,
--					freq2, mode);
+-					freq1, mode);
 -			ee->ee_n_piers[mode]++;
 -		}
 +		pc[i++].freq = ath5k_eeprom_bin2freq(ee,
 +				freq1, mode);
 +		ee->ee_n_piers[mode]++;
  
+-		if (freq2) {
+-			pc[i++].freq = ath5k_eeprom_bin2freq(ee,
+-					freq2, mode);
+-			ee->ee_n_piers[mode]++;
+-		}
+-
 -		if (!freq1 || !freq2)
 +		freq2 = (val >> 8) & 0xff;
 +		if (!freq2)
@@ -79,8 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 -	if ((ee->ee_x_gain[mode] >> 2) & 0x1) pd_gains++;
 -	if ((ee->ee_x_gain[mode] >> 3) & 0x1) pd_gains++;
 -	ee->ee_pd_gains[mode] = pd_gains;
-+	u8 pd_gains;
- 
+-
 -	offset = ath5k_cal_data_offset_2413(ee, mode);
 -	ee->ee_n_piers[mode] = 0;
 -	switch (mode) {
@@ -95,7 +94,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 -	case AR5K_EEPROM_MODE_11B:
 -		if (!AR5K_EEPROM_HDR_11B(ee->ee_header))
 -			return 0;
--
++	u8 pd_gains;
+ 
 -		ath5k_eeprom_init_11bg_2413(ah, mode, offset);
 -		offset += AR5K_EEPROM_N_2GHZ_CHAN_2413 / 2;
 -		gen_chan_info = ee->ee_pwr_cal_b;