linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

net: cosmetic: Do not use magic values for ARP_HLEN

Browse Source 
Commit 674bb24982 ("net: cosmetic: Replace magic numbers in arp.c with
constants") introduced a nice define to replace the magic value 6 for
the ethernet hardware address. Replace more hardcoded instances of 6
which really reference the ARP_HLEN (iow the MAC/Hardware/Ethernet
address).

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
oliver@schinagl.nl
2016-11-25 16:30:19 +01:00
committed by Joe Hershberger
parent 6d2c1d26ee
commit a40db6d511
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/eth-uclass.c
View File

@ -230,7 +230,7 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op,
eth_write_hwaddr(dev);
break;
case env_op_delete:
memset(pdata->enetaddr, 0, 6);
memset(pdata->enetaddr, 0, ARP_HLEN);
}
}
@ -458,7 +458,7 @@ static int eth_post_probe(struct udevice *dev)
{
struct eth_device_priv *priv = dev->uclass_priv;
struct eth_pdata *pdata = dev->platdata;
unsigned char env_enetaddr[6];
unsigned char env_enetaddr[ARP_HLEN];
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
struct eth_ops *ops = eth_get_ops(dev);
@ -497,7 +497,7 @@ static int eth_post_probe(struct udevice *dev)
eth_getenv_enetaddr_by_index("eth", dev->seq, env_enetaddr);
if (!is_zero_ethaddr(env_enetaddr)) {
if (!is_zero_ethaddr(pdata->enetaddr) &&
memcmp(pdata->enetaddr, env_enetaddr, 6)) {
memcmp(pdata->enetaddr, env_enetaddr, ARP_HLEN)) {
printf("\nWarning: %s MAC addresses don't match:\n",
dev->name);
printf("Address in SROM is %pM\n",
@ -507,7 +507,7 @@ static int eth_post_probe(struct udevice *dev)
}
/* Override the ROM MAC address */
memcpy(pdata->enetaddr, env_enetaddr, 6);
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_setenv_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
printf("\nWarning: %s using MAC address from ROM\n",
@ -535,7 +535,7 @@ static int eth_pre_remove(struct udevice *dev)
eth_get_ops(dev)->stop(dev);
/* clear the MAC address */
memset(pdata->enetaddr, 0, 6);
memset(pdata->enetaddr, 0, ARP_HLEN);
return 0;
}