X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F403-ath9k-fix-invalid-mac-address-handling.patch;h=63cb3d979e7207868cac2cc7ff815486463d09a5;hb=c3a643f552f4d3a15e17f08eddb616086cc34157;hp=5bd342ff3d2467ce10037c234f9e520d539b8334;hpb=23674ee04812bbfd15be68641798d33b508bde63;p=openwrt-10.03%2F.git

diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index 5bd342ff3..63cb3d979 100644
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -1,22 +1,30 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -524,8 +524,18 @@ static int ath9k_hw_init_macaddr(struct 
- 		ah->macaddr[2 * i] = eeval >> 8;
- 		ah->macaddr[2 * i + 1] = eeval & 0xff;
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <linux/io.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ 
+ #include "hw.h"
+@@ -461,8 +462,18 @@ static int ath9k_hw_init_macaddr(struct 
+ 		common->macaddr[2 * i] = eeval >> 8;
+ 		common->macaddr[2 * i + 1] = eeval & 0xff;
  	}
 -	if (sum == 0 || sum == 0xffff * 3)
 -		return -EADDRNOTAVAIL;
-+	if (!is_valid_ether_addr(ah->macaddr)) {
++	if (!is_valid_ether_addr(common->macaddr)) {
 +		DECLARE_MAC_BUF(macbuf);
 +
-+		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
++		ath_print(common, ATH_DBG_EEPROM,
 +			"eeprom contains invalid mac address: %s\n",
-+			print_mac(macbuf, ah->macaddr));
++			print_mac(macbuf, common->macaddr));
 +
-+		random_ether_addr(ah->macaddr);
-+		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
++		random_ether_addr(common->macaddr);
++		ath_print(common, ATH_DBG_EEPROM,
 +			"random mac address will be used: %s\n",
-+			print_mac(macbuf, ah->macaddr));
++			print_mac(macbuf, common->macaddr));
 +	}
  
  	return 0;