diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-10-18 17:38:59 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-18 17:38:59 +0000 |
commit | 2a685ec414827d135ee2788e42eed8021349aae1 (patch) | |
tree | 6bac812e354dc97195bb8843af018fed228440d6 /package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch | |
parent | 3cb3abd960114f0efc8b13f5c53b256cb5f704a6 (diff) | |
download | master-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.tar.gz master-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.tar.bz2 master-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.zip |
mac80211: update to 2014-10-08
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch')
-rw-r--r-- | package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch b/package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch new file mode 100644 index 0000000000..ce6c0819d3 --- /dev/null +++ b/package/kernel/mac80211/patches/335-ath9k-use-a-random-MAC-address-if-the-EEPROM-address.patch @@ -0,0 +1,39 @@ +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> +--- + +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -19,6 +19,7 @@ + #include <linux/module.h> + #include <linux/time.h> + #include <linux/bitops.h> ++#include <linux/etherdevice.h> + #include <asm/unaligned.h> + + #include "hw.h" +@@ -446,8 +447,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; + } |