X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/23674ee04812bbfd15be68641798d33b508bde63..570749fed10a9c755bbf34eeb88f9ce8cdbdb0b5:/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch?ds=inline 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 5bd342ff3..bd4354813 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,22 +1,28 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -524,8 +524,18 @@ static int ath9k_hw_init_macaddr(struct - ah->macaddr[2 * i] = eeval >> 8; - ah->macaddr[2 * i + 1] = eeval & 0xff; +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include "hw.h" +@@ -464,8 +465,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(ah->macaddr)) { -+ DECLARE_MAC_BUF(macbuf); -+ -+ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, -+ "eeprom contains invalid mac address: %s\n", -+ print_mac(macbuf, ah->macaddr)); ++ if (!is_valid_ether_addr(common->macaddr)) { ++ ath_err(common, ++ "eeprom contains invalid mac address: %pM\n", ++ common->macaddr); + -+ random_ether_addr(ah->macaddr); -+ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, -+ "random mac address will be used: %s\n", -+ print_mac(macbuf, ah->macaddr)); ++ random_ether_addr(common->macaddr); ++ ath_err(common, ++ "random mac address will be used: %pM\n", ++ common->macaddr); + } return 0;