X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F403-ath9k-fix-invalid-mac-address-handling.patch;h=8f41b5b8df9dd67a2d78ee45861690fb914a04f2;hb=e93015c4d471dd96723008344b3008afa6ff4177;hp=4539b30fefafba8ca08faa50c5ce9b486f47f6d9;hpb=4ea1d4e108bf0f38f7a0158da978d503a8d695bf;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 4539b30fe..8f41b5b8d 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,25 +1,25 @@
 --- a/drivers/net/wireless/ath9k/hw.c
 +++ b/drivers/net/wireless/ath9k/hw.c
-@@ -500,11 +500,18 @@ static int ath9k_hw_init_macaddr(struct 
- 		ahp->ah_macaddr[2 * i] = eeval >> 8;
- 		ahp->ah_macaddr[2 * i + 1] = eeval & 0xff;
+@@ -494,11 +494,18 @@ static int ath9k_hw_init_macaddr(struct 
+ 		ah->macaddr[2 * i] = eeval >> 8;
+ 		ah->macaddr[2 * i + 1] = eeval & 0xff;
  	}
 -	if (sum == 0 || sum == 0xffff * 3) {
 +
-+	if (!is_valid_ether_addr(ahp->ah_macaddr)) {
++	if (!is_valid_ether_addr(ah->macaddr)) {
 +		DECLARE_MAC_BUF(macbuf);
 +
 +		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
 +			"eeprom contains invalid mac address: %s\n",
-+			print_mac(macbuf, ahp->ah_macaddr));
++			print_mac(macbuf, ah->macaddr));
 +
-+		random_ether_addr(ahp->ah_macaddr);
++		random_ether_addr(ah->macaddr);
  		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
 -			"mac address read failed: %pM\n",
--			ahp->ah_macaddr);
+-			ah->macaddr);
 -		return -EADDRNOTAVAIL;
 +			"random mac address will be used: %s\n",
-+			print_mac(macbuf, ahp->ah_macaddr));
++			print_mac(macbuf, ah->macaddr));
  	}
  
  	return 0;