diff options
author | sascha <sascha@nomad.localdomain> | 2007-10-18 11:17:16 +0200 |
---|---|---|
committer | sascha <sascha@nomad.localdomain> | 2007-10-18 11:17:16 +0200 |
commit | 1b272d80f11438821efa40c91883f2d2713243ad (patch) | |
tree | 24bd34f26c97bda9a1c9e0dcdf9d792d883b9e69 /net | |
parent | c054a3682dc169d05300f244b0aaff9b22892c5e (diff) | |
download | barebox-1b272d80f11438821efa40c91883f2d2713243ad.tar.gz barebox-1b272d80f11438821efa40c91883f2d2713243ad.tar.xz |
change functions containing 'mac' or 'enet' in its name to 'ethaddr'.
change the parameter name for ethernet devices to 'ethaddr' aswell.
Diffstat (limited to 'net')
-rw-r--r-- | net/eth.c | 16 | ||||
-rw-r--r-- | net/net.c | 6 |
2 files changed, 11 insertions, 11 deletions
@@ -49,9 +49,9 @@ int eth_open(void) if (!eth_current) return 0; - string_to_enet_addr(dev_get_param(eth_current->dev, "mac"), mac); + string_to_ethaddr(dev_get_param(eth_current->dev, "ethaddr"), mac); - eth_current->set_mac_address(eth_current, mac); + eth_current->set_ethaddr(eth_current, mac); eth_current->open(eth_current); @@ -90,26 +90,26 @@ int eth_register(struct eth_device *edev) unsigned char ethaddr_str[20]; unsigned char ethaddr[6]; - if (!edev->get_mac_address) { + if (!edev->get_ethaddr) { printf("no get_mac_address found for current eth device\n"); return -1; } edev->param_ip.name = "ip"; - edev->param_mac.name = "mac"; + edev->param_ethaddr.name = "ethaddr"; edev->param_gateway.name = "gateway"; edev->param_netmask.name = "netmask"; edev->param_serverip.name = "serverip"; dev_add_param(dev, &edev->param_ip); - dev_add_param(dev, &edev->param_mac); + dev_add_param(dev, &edev->param_ethaddr); dev_add_param(dev, &edev->param_gateway); dev_add_param(dev, &edev->param_netmask); dev_add_param(dev, &edev->param_serverip); - if (edev->get_mac_address(edev, ethaddr) == 0) { - enet_addr_to_string(ethaddr, ethaddr_str); + if (edev->get_ethaddr(edev, ethaddr) == 0) { + ethaddr_to_string(ethaddr, ethaddr_str); printf("got MAC address from EEPROM: %s\n",ethaddr_str); - dev_set_param(dev, "mac", ethaddr_str); + dev_set_param(dev, "ethaddr", ethaddr_str); // memcpy(edev->enetaddr, ethaddr, 6); } @@ -291,7 +291,7 @@ NetLoop(proto_t protocol) return -1; restart: - string_to_enet_addr(dev_get_param(eth_get_current()->dev, "mac"), + string_to_ethaddr(dev_get_param(eth_get_current()->dev, "mac"), NetOurEther); NetState = NETLOOP_CONTINUE; @@ -1569,7 +1569,7 @@ ushort getenv_VLAN(char *var) return (string_to_VLAN(getenv(var))); } -int string_to_enet_addr(const char *str, char *enetaddr) +int string_to_ethaddr(const char *str, char *enetaddr) { ulong reg; char *e; @@ -1589,7 +1589,7 @@ int string_to_enet_addr(const char *str, char *enetaddr) return 0; } -void enet_addr_to_string(const unsigned char *enetaddr, char *str) +void ethaddr_to_string(const unsigned char *enetaddr, char *str) { sprintf (str, "%02X:%02X:%02X:%02X:%02X:%02X", enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3], |