X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F403-ath9k-fix-invalid-mac-address-handling.patch;h=592c4982ea38539752a933edb028a498968eec77;hb=f044ea3f82f4d80c91c78b864dd1dc8206bd5ee9;hp=63cb3d979e7207868cac2cc7ff815486463d09a5;hpb=c3a643f552f4d3a15e17f08eddb616086cc34157;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 63cb3d979..592c4982e 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,30 +1,28 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -15,6 +15,7 @@
-  */
+@@ -16,6 +16,7 @@
  
  #include <linux/io.h>
+ #include <linux/slab.h>
 +#include <linux/etherdevice.h>
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -461,8 +462,18 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -423,8 +424,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(common->macaddr)) {
-+		DECLARE_MAC_BUF(macbuf);
-+
-+		ath_print(common, ATH_DBG_EEPROM,
-+			"eeprom contains invalid mac address: %s\n",
-+			print_mac(macbuf, common->macaddr));
++		ath_err(common,
++			"eeprom contains invalid mac address: %pM\n",
++			common->macaddr);
 +
 +		random_ether_addr(common->macaddr);
-+		ath_print(common, ATH_DBG_EEPROM,
-+			"random mac address will be used: %s\n",
-+			print_mac(macbuf, common->macaddr));
++		ath_err(common,
++			"random mac address will be used: %pM\n",
++			common->macaddr);
 +	}
  
  	return 0;