mac80211/ath9k: fix invalid MAC address handling
authorGabor Juhos <juhosg@openwrt.org>
Sun, 1 Feb 2009 16:15:45 +0000 (16:15 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sun, 1 Feb 2009 16:15:45 +0000 (16:15 +0000)
SVN-Revision: 14342

package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch [new file with mode: 0644]

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 (file)
index 0000000..2a1763a
--- /dev/null
@@ -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;