X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7b359d21c6e0a32cae436315fbae897f9b3a4f27..ba3ef5325d36035a125c0747296bd3ed7cbab993:/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

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 eabba06e7..65853b970 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 @@
-  */
- 
+@@ -17,6 +17,7 @@
  #include <linux/io.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
 +#include <linux/etherdevice.h>
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -485,8 +486,18 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -465,8 +466,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;