X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F501-ath9k-eeprom_endianess.patch;h=fb3b38b14205b6f29ab8074877dd2920fd01d3a0;hp=710ca7bad9644e59dd0db79927efc5f8d28a4487;hb=e2b14bcc0c4c0fd360d6fda3d368bee19405dcbd;hpb=f8064339c0a92fef79eeb0a00903e7dfe8633b6f

diff --git a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
index 710ca7bad9..fb3b38b142 100644
--- a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
+++ b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
@@ -1,15 +1,15 @@
 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
-@@ -267,7 +267,7 @@ static int ath9k_hw_def_check_eeprom(str
- 	struct ar5416_eeprom_def *eep =
- 		(struct ar5416_eeprom_def *) &ah->eeprom.def;
+@@ -262,7 +262,7 @@ static int ath9k_hw_def_check_eeprom(str
+ {
+ 	struct ar5416_eeprom_def *eep = &ah->eeprom.def;
  	struct ath_common *common = ath9k_hw_common(ah);
 -	u16 *eepdata, temp, magic, magic2;
 +	u16 *eepdata, temp, magic;
  	u32 sum = 0, el;
  	bool need_swap = false;
  	int i, addr, size;
-@@ -277,27 +277,16 @@ static int ath9k_hw_def_check_eeprom(str
+@@ -272,27 +272,16 @@ static int ath9k_hw_def_check_eeprom(str
  		return false;
  	}
  
@@ -49,29 +49,29 @@
  
 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-@@ -196,7 +196,7 @@ static int ath9k_hw_4k_check_eeprom(stru
- 	int i, addr;
- 
+@@ -57,7 +57,7 @@ static bool ath9k_hw_4k_fill_eeprom(stru
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
  
 -	if (!ath9k_hw_use_flash(ah)) {
 +	if (!(ah->ah_flags & AH_NO_EEP_SWAP)) {
- 		if (!ath9k_hw_nvram_read(common, AR5416_EEPROM_MAGIC_OFFSET,
- 					 &magic)) {
- 			ath_err(common, "Reading Magic # failed\n");
+ 		ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");
+ 	}
+ 
 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
 +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
-@@ -189,7 +189,7 @@ static int ath9k_hw_ar9287_check_eeprom(
- 	struct ar9287_eeprom *eep = &ah->eeprom.map9287;
+@@ -60,7 +60,7 @@ static bool ath9k_hw_ar9287_fill_eeprom(
+ {
  	struct ath_common *common = ath9k_hw_common(ah);
  
 -	if (!ath9k_hw_use_flash(ah)) {
 +	if (!(ah->ah_flags & AH_NO_EEP_SWAP)) {
- 		if (!ath9k_hw_nvram_read(common, AR5416_EEPROM_MAGIC_OFFSET,
- 					 &magic)) {
- 			ath_err(common, "Reading Magic # failed\n");
+ 		ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");
+ 	}
+ 
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -657,6 +657,7 @@ enum ath_cal_list {
+@@ -739,6 +739,7 @@ enum ath_cal_list {
  #define AH_USE_EEPROM   0x1
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  #define AH_FASTCC       0x4
@@ -81,7 +81,7 @@
  	struct ath_ops reg_ops;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -536,6 +536,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -591,6 +591,8 @@ static int ath9k_init_softc(u16 devid, s
  		ah->is_clk_25mhz = pdata->is_clk_25mhz;
  		ah->get_mac_revision = pdata->get_mac_revision;
  		ah->external_reset = pdata->external_reset;
@@ -92,7 +92,7 @@
  	common = ath9k_hw_common(ah);
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
-@@ -29,6 +29,7 @@ struct ath9k_platform_data {
+@@ -31,6 +31,7 @@ struct ath9k_platform_data {
  	u32 gpio_mask;
  	u32 gpio_val;