dfcd340721
Add patches from Hauke adding linux 3.0 compatibility. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 27187
29 lines
732 B
Diff
29 lines
732 B
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -16,6 +16,7 @@
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
+#include <linux/etherdevice.h>
|
|
#include <asm/unaligned.h>
|
|
|
|
#include "hw.h"
|
|
@@ -434,8 +435,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)) {
|
|
+ ath_err(common,
|
|
+ "eeprom contains invalid mac address: %pM\n",
|
|
+ common->macaddr);
|
|
+
|
|
+ random_ether_addr(common->macaddr);
|
|
+ ath_err(common,
|
|
+ "random mac address will be used: %pM\n",
|
|
+ common->macaddr);
|
|
+ }
|
|
|
|
return 0;
|
|
}
|