aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-01 16:15:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-01 16:15:45 +0000
commite07cdce207ed72379e21ae6f8f3037da7d9a185d (patch)
tree3e52f9e408d95ba29b3d3c80228a035f1b4dfbaf
parent0dfca05fbedad2e31da249f16a035f5117463fbb (diff)
downloadupstream-e07cdce207ed72379e21ae6f8f3037da7d9a185d.tar.gz
upstream-e07cdce207ed72379e21ae6f8f3037da7d9a185d.tar.bz2
upstream-e07cdce207ed72379e21ae6f8f3037da7d9a185d.zip
mac80211/ath9k: fix invalid MAC address handling
SVN-Revision: 14342
-rw-r--r--package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
new file mode 100644
index 0000000000..2a1763a93f
--- /dev/null
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/wireless/ath9k/hw.c
++++ b/drivers/net/wireless/ath9k/hw.c
+@@ -499,11 +499,18 @@ static int ath9k_hw_init_macaddr(struct
+ ahp->ah_macaddr[2 * i] = eeval >> 8;
+ ahp->ah_macaddr[2 * i + 1] = eeval & 0xff;
+ }
+- if (sum == 0 || sum == 0xffff * 3) {
++
++ if (!is_valid_ether_addr(ahp->ah_macaddr)) {
++ DECLARE_MAC_BUF(macbuf);
++
++ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
++ "eeprom contains invalid mac address: %s\n",
++ print_mac(macbuf, ahp->ah_macaddr));
++
++ random_ether_addr(ahp->ah_macaddr);
+ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
+- "mac address read failed: %pM\n",
+- ahp->ah_macaddr);
+- return -EADDRNOTAVAIL;
++ "random mac address will be used: %s\n",
++ print_mac(macbuf, ahp->ah_macaddr));
+ }
+
+ return 0;