2014-10-18 17:38:59 +00:00
|
|
|
From: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
Date: Sat, 18 Oct 2014 18:31:49 +0200
|
|
|
|
Subject: [PATCH] ath9k: use a random MAC address if the EEPROM address
|
|
|
|
is invalid
|
|
|
|
|
|
|
|
Based on OpenWrt patch by Gabor Juhos
|
|
|
|
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
---
|
|
|
|
|
2009-05-01 13:43:12 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
2013-12-14 17:07:08 +00:00
|
|
|
@@ -19,6 +19,7 @@
|
2011-11-18 11:27:19 +00:00
|
|
|
#include <linux/module.h>
|
2013-11-18 19:58:53 +00:00
|
|
|
#include <linux/time.h>
|
2013-12-14 17:07:08 +00:00
|
|
|
#include <linux/bitops.h>
|
2009-10-11 00:36:23 +00:00
|
|
|
+#include <linux/etherdevice.h>
|
|
|
|
#include <asm/unaligned.h>
|
|
|
|
|
|
|
|
#include "hw.h"
|
2014-09-27 20:52:11 +00:00
|
|
|
@@ -446,8 +447,16 @@ static int ath9k_hw_init_macaddr(struct
|
2009-10-11 00:36:23 +00:00
|
|
|
common->macaddr[2 * i] = eeval >> 8;
|
|
|
|
common->macaddr[2 * i + 1] = eeval & 0xff;
|
2009-02-01 16:15:45 +00:00
|
|
|
}
|
2009-05-01 13:43:12 +00:00
|
|
|
- if (sum == 0 || sum == 0xffff * 3)
|
|
|
|
- return -EADDRNOTAVAIL;
|
2009-10-11 00:36:23 +00:00
|
|
|
+ if (!is_valid_ether_addr(common->macaddr)) {
|
2010-12-11 01:45:12 +00:00
|
|
|
+ ath_err(common,
|
2010-03-10 01:09:12 +00:00
|
|
|
+ "eeprom contains invalid mac address: %pM\n",
|
|
|
|
+ common->macaddr);
|
2009-02-01 16:15:45 +00:00
|
|
|
+
|
2009-10-11 00:36:23 +00:00
|
|
|
+ random_ether_addr(common->macaddr);
|
2010-12-11 01:45:12 +00:00
|
|
|
+ ath_err(common,
|
2010-03-10 01:09:12 +00:00
|
|
|
+ "random mac address will be used: %pM\n",
|
|
|
|
+ common->macaddr);
|
2009-05-01 13:43:12 +00:00
|
|
|
+ }
|
2009-02-01 16:15:45 +00:00
|
|
|
|
|
|
|
return 0;
|
2009-05-01 13:43:12 +00:00
|
|
|
}
|