diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-09 16:56:35 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-09 16:56:35 (GMT) |
| commit | e1a71f8b339220fa74c9cd5d36ae9c444c492e83 (patch) | |
| tree | 5eca7ff69f390f4c2f2df3459d3e2db3d91b7af9 /net/eth_legacy.c | |
| parent | 6f57b19857b514f6e94e423c9bbe2d4b8973a0db (diff) | |
| parent | a5fd13ad1913d9c66c47666dbedac7703a48e502 (diff) | |
| download | u-boot-fsl-qoriq-e1a71f8b339220fa74c9cd5d36ae9c444c492e83.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/eth_legacy.c')
| -rw-r--r-- | net/eth_legacy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/eth_legacy.c b/net/eth_legacy.c index 1354f49..e4bd0f4 100644 --- a/net/eth_legacy.c +++ b/net/eth_legacy.c @@ -121,7 +121,7 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op, eth_write_hwaddr(dev, "eth", dev->index); break; case env_op_delete: - memset(dev->enetaddr, 0, 6); + memset(dev->enetaddr, 0, ARP_HLEN); } } dev = dev->next; @@ -134,14 +134,14 @@ U_BOOT_ENV_CALLBACK(ethaddr, on_ethaddr); int eth_write_hwaddr(struct eth_device *dev, const char *base_name, int eth_number) { - unsigned char env_enetaddr[6]; + unsigned char env_enetaddr[ARP_HLEN]; int ret = 0; eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr); if (!is_zero_ethaddr(env_enetaddr)) { if (!is_zero_ethaddr(dev->enetaddr) && - memcmp(dev->enetaddr, env_enetaddr, 6)) { + memcmp(dev->enetaddr, env_enetaddr, ARP_HLEN)) { printf("\nWarning: %s MAC addresses don't match:\n", dev->name); printf("Address in SROM is %pM\n", @@ -150,7 +150,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, env_enetaddr); } - memcpy(dev->enetaddr, env_enetaddr, 6); + memcpy(dev->enetaddr, env_enetaddr, ARP_HLEN); } else if (is_valid_ethaddr(dev->enetaddr)) { eth_setenv_enetaddr_by_index(base_name, eth_number, dev->enetaddr); @@ -299,7 +299,7 @@ int eth_initialize(void) */ int eth_mcast_join(struct in_addr mcast_ip, int join) { - u8 mcast_mac[6]; + u8 mcast_mac[ARP_HLEN]; if (!eth_current || !eth_current->mcast) return -1; mcast_mac[5] = htonl(mcast_ip.s_addr) & 0xff; |