mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-28 07:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: Rename helper function to be more clear

Browse Source 
Make it clear that the helper is checking the addr, not setting it.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2015-03-22 17:09:01 -05:00 committed by Simon Glass
parent 8b2c9a7157
commit 4c7c65afbe
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/eth.c
View File

@ -153,11 +153,6 @@ static void eth_current_changed(void)
setenv("ethact", NULL);
}
static int eth_address_set(unsigned char *addr)
{
return memcmp(addr, "\0\0\0\0\0\0", 6);
}
int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
int eth_number)
{
@ -166,9 +161,9 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
if (eth_address_set(env_enetaddr)) {
if (eth_address_set(dev->enetaddr) &&
memcmp(dev->enetaddr, env_enetaddr, 6)) {
if (!is_zero_ether_addr(env_enetaddr)) {
if (!is_zero_ether_addr(dev->enetaddr) &&
memcmp(dev->enetaddr, env_enetaddr, 6)) {
printf("\nWarning: %s MAC addresses don't match:\n",
dev->name);
printf("Address in SROM is %pM\n",
@ -183,7 +178,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
dev->enetaddr);
printf("\nWarning: %s using MAC address from net device\n",
dev->name);
} else if (!(eth_address_set(dev->enetaddr))) {
} else if (is_zero_ether_addr(dev->enetaddr)) {
printf("\nError: %s address not set.\n",
dev->name);
return -EINVAL;