diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
commit | e4f208ebf3029f415cf0a79d41ea27fa45c2a62c (patch) | |
tree | f3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch | |
parent | c47c2671d413055a8753f2aec429a8d072c5ed9a (diff) | |
download | upstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.gz upstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.bz2 upstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.zip |
mac80211: update to wireless-testing 2012-04-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch')
-rw-r--r-- | package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch new file mode 100644 index 0000000000..7018bf387a --- /dev/null +++ b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch @@ -0,0 +1,29 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -17,6 +17,7 @@ + #include <linux/io.h> + #include <linux/slab.h> + #include <linux/module.h> ++#include <linux/etherdevice.h> + #include <asm/unaligned.h> + + #include "hw.h" +@@ -482,8 +483,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; + } |