diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-16 19:02:26 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-16 19:02:26 +0000 |
commit | e6cd84447faacb784cf25c3bebdbcaa1907ae44e (patch) | |
tree | 258b099b6e0b2eb304d69acc3c85eb5d1341cb22 /package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | |
parent | 416ef200810f75876c4d63906a8e726bcb8511aa (diff) | |
download | upstream-e6cd84447faacb784cf25c3bebdbcaa1907ae44e.tar.gz upstream-e6cd84447faacb784cf25c3bebdbcaa1907ae44e.tar.bz2 upstream-e6cd84447faacb784cf25c3bebdbcaa1907ae44e.zip |
mac80211: update compat-wireless to 2009-02-15
SVN-Revision: 14532
Diffstat (limited to 'package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch')
-rw-r--r-- | package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | 16 |
1 files changed, 8 insertions, 8 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 index 4539b30fef..3423999261 100644 --- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch +++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch @@ -1,25 +1,25 @@ --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c -@@ -500,11 +500,18 @@ static int ath9k_hw_init_macaddr(struct - ahp->ah_macaddr[2 * i] = eeval >> 8; - ahp->ah_macaddr[2 * i + 1] = eeval & 0xff; +@@ -493,11 +493,18 @@ static int ath9k_hw_init_macaddr(struct + ah->macaddr[2 * i] = eeval >> 8; + ah->macaddr[2 * i + 1] = eeval & 0xff; } - if (sum == 0 || sum == 0xffff * 3) { + -+ if (!is_valid_ether_addr(ahp->ah_macaddr)) { ++ if (!is_valid_ether_addr(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)); ++ print_mac(macbuf, ah->macaddr)); + -+ random_ether_addr(ahp->ah_macaddr); ++ random_ether_addr(ah->macaddr); DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, - "mac address read failed: %pM\n", -- ahp->ah_macaddr); +- ah->macaddr); - return -EADDRNOTAVAIL; + "random mac address will be used: %s\n", -+ print_mac(macbuf, ahp->ah_macaddr)); ++ print_mac(macbuf, ah->macaddr)); } return 0; |