malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "net: stmmac: set valid mac addr in success case"

Browse Source
This commit is contained in:
qctecmdr 2020-09-18 23:33:17 -07:00 committed by Gerrit - the friendly Code Review server
commit a3a9cf3b1a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
View File

@ -2707,7 +2707,6 @@ static void read_mac_addr_from_fuse_reg(struct device_node *np)
u32 mac_efuse_prop, efuse_size = 8;
void __iomem *mac_efuse_addr;
unsigned long mac_addr;
bool valid_mac = false;
ret = of_property_read_u32(np, "mac-efuse-addr", &mac_efuse_prop);
if (!ret) {
@ -2725,14 +2724,13 @@ static void read_mac_addr_from_fuse_reg(struct device_node *np)
mac_addr = mac_addr >> 8;
}
valid_mac = is_valid_ether_addr(pparams.mac_addr);
if (!valid_mac) {
pparams.is_valid_mac_addr =
is_valid_ether_addr(pparams.mac_addr);
if (!pparams.is_valid_mac_addr) {
ETHQOSERR("Invalid Mac address set: %llx\n", mac_addr);
return;
}
}
pparams.is_valid_mac_addr = true;
}
static int qcom_ethqos_probe(struct platform_device *pdev)