X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F403-ath9k-fix-invalid-mac-address-handling.patch;h=554527e3b8ae76887f17af9c48bf76f64fba5008;hp=c41495175269d82a4a4346f7a182c2d5818ee641;hb=88b49702e0708b91be64fff8db8c37bb92889ba3;hpb=c2e27e11f2d0372f50025f563447f2c2564576de

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 c414951752..554527e3b8 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 @@
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
- #include <linux/io.h>
 +#include <linux/etherdevice.h>
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -437,8 +438,18 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -431,8 +432,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));
++			"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));
++			"random mac address will be used: %pM\n",
++			common->macaddr);
 +	}
  
  	return 0;