X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F403-ath9k-fix-invalid-mac-address-handling.patch;h=946dda567ee64900bacaac69cfd161aeb0322c1e;hp=e60a50f07e3f0bd705aa5ba1fee814340c425448;hb=5eaa0e53858e7125b7cfb849f6f321747cf0c42e;hpb=094507e8fede9ed92407b1684d7e7106a94a7644

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 e60a50f07..946dda567 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,28 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -521,8 +521,18 @@ static int ath9k_hw_init_macaddr(struct 
- 		ah->macaddr[2 * i] = eeval >> 8;
- 		ah->macaddr[2 * i + 1] = eeval & 0xff;
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/io.h>
+ #include <linux/slab.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ 
+ #include "hw.h"
+@@ -456,8 +457,16 @@ 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)) {
-+		DECLARE_MAC_BUF(macbuf);
-+
-+		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-+			"eeprom contains invalid mac address: %s\n",
-+			print_mac(macbuf, ah->macaddr));
++	if (!is_valid_ether_addr(common->macaddr)) {
++		ath_print(common, ATH_DBG_EEPROM,
++			"eeprom contains invalid mac address: %pM\n",
++			common->macaddr);
 +
-+		random_ether_addr(ah->macaddr);
-+		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-+			"random mac address will be used: %s\n",
-+			print_mac(macbuf, ah->macaddr));
++		random_ether_addr(common->macaddr);
++		ath_print(common, ATH_DBG_EEPROM,
++			"random mac address will be used: %pM\n",
++			common->macaddr);
 +	}
  
  	return 0;