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 /include/net.h | |
| 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 'include/net.h')
| -rw-r--r-- | include/net.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net.h b/include/net.h index 3bc712e382..8a3187260d 100644 --- a/include/net.h +++ b/include/net.h @@ -65,8 +65,8 @@ struct eth_device { int (*send) (struct eth_device*, void *packet, int length); int (*recv) (struct eth_device*); void (*halt) (struct eth_device*); - int (*get_mac_address) (struct eth_device*, unsigned char *adr); - int (*set_mac_address) (struct eth_device*, unsigned char *adr); + int (*get_ethaddr) (struct eth_device*, unsigned char *adr); + int (*set_ethaddr) (struct eth_device*, unsigned char *adr); struct eth_device *next; void *priv; @@ -75,7 +75,7 @@ struct eth_device { struct param_d param_netmask; struct param_d param_gateway; struct param_d param_serverip; - struct param_d param_mac; + struct param_d param_ethaddr; struct device_d *dev; }; @@ -88,7 +88,7 @@ void eth_try_another(int first_restart); /* Change the device */ struct eth_device *eth_get_dev(void); /* get the current device MAC */ struct eth_device *eth_get_dev_by_name(char *devname); /* get device */ int eth_get_dev_index (void); /* get the device index */ -void eth_set_enetaddr(int num, char* a); /* Set new MAC address */ +void eth_set_ethaddr(int num, char* a); /* Set new MAC address */ int eth_open(void); /* open the device */ int eth_send(void *packet, int length); /* Send a packet */ @@ -424,8 +424,8 @@ IPaddr_t getenv_IPaddr (char *); /* read a VLAN id from an environment variable */ ushort getenv_VLAN(char *); -int string_to_enet_addr(const char *str, char *enetaddr); -void enet_addr_to_string(const unsigned char *enetaddr, char *str); +int string_to_ethaddr(const char *str, char *enetaddr); +void ethaddr_to_string(const unsigned char *enetaddr, char *str); /**********************************************************************/ /* Network devices */ |