--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -534,8 +534,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"
+@@ -451,8 +452,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;