X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b91abeede47da1ed71f54d109d69339e5715a081..bdc88cc893f6881aba095e9eb36ef4a070fd8baf:/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 8f41b5b8d..23631dcac 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,29 @@ ---- a/drivers/net/wireless/ath9k/hw.c -+++ b/drivers/net/wireless/ath9k/hw.c -@@ -494,11 +494,18 @@ static int ath9k_hw_init_macaddr(struct - ah->macaddr[2 * i] = eeval >> 8; - ah->macaddr[2 * i + 1] = eeval & 0xff; +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include "hw.h" +@@ -451,8 +452,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) { -+ -+ 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)); -+ -+ random_ether_addr(ah->macaddr); - DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, -- "mac address read failed: %pM\n", -- ah->macaddr); +- if (sum == 0 || sum == 0xffff * 3) - return -EADDRNOTAVAIL; -+ "random mac address will be used: %s\n", -+ print_mac(macbuf, ah->macaddr)); - } ++ if (!is_valid_ether_addr(common->macaddr)) { ++ ath_print(common, ATH_DBG_EEPROM, ++ "eeprom contains invalid mac address: %pM\n", ++ common->macaddr); ++ ++ random_ether_addr(common->macaddr); ++ ath_print(common, ATH_DBG_EEPROM, ++ "random mac address will be used: %pM\n", ++ common->macaddr); ++ } return 0; + }