eth: eth MAC addresses are six bytes
Reduce confusion by making clear six bytes are passed, not a string. Signed-off-by: Johannes Stezenbach <js@sig21.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
8f2fcf6554
commit
69e07e2afb
|
@ -38,8 +38,8 @@ struct eth_device {
|
||||||
int (*send) (struct eth_device*, void *packet, int length);
|
int (*send) (struct eth_device*, void *packet, int length);
|
||||||
int (*recv) (struct eth_device*);
|
int (*recv) (struct eth_device*);
|
||||||
void (*halt) (struct eth_device*);
|
void (*halt) (struct eth_device*);
|
||||||
int (*get_ethaddr) (struct eth_device*, unsigned char *adr);
|
int (*get_ethaddr) (struct eth_device*, u8 adr[6]);
|
||||||
int (*set_ethaddr) (struct eth_device*, unsigned char *adr);
|
int (*set_ethaddr) (struct eth_device*, u8 adr[6]);
|
||||||
|
|
||||||
struct eth_device *next;
|
struct eth_device *next;
|
||||||
void *priv;
|
void *priv;
|
||||||
|
@ -287,8 +287,8 @@ int string_to_ip(const char *s, IPaddr_t *ip);
|
||||||
IPaddr_t getenv_ip(const char *name);
|
IPaddr_t getenv_ip(const char *name);
|
||||||
int setenv_ip(const char *name, IPaddr_t ip);
|
int setenv_ip(const char *name, IPaddr_t ip);
|
||||||
|
|
||||||
int string_to_ethaddr(const char *str, char *enetaddr);
|
int string_to_ethaddr(const char *str, u8 enetaddr[6]);
|
||||||
void ethaddr_to_string(const unsigned char *enetaddr, char *str);
|
void ethaddr_to_string(const u8 enetaddr[6], char *str);
|
||||||
|
|
||||||
#ifdef CONFIG_NET_RESOLV
|
#ifdef CONFIG_NET_RESOLV
|
||||||
IPaddr_t resolv(char *host);
|
IPaddr_t resolv(char *host);
|
||||||
|
|
|
@ -169,7 +169,7 @@ int eth_rx(void)
|
||||||
static int eth_set_ethaddr(struct device_d *dev, struct param_d *param, const char *val)
|
static int eth_set_ethaddr(struct device_d *dev, struct param_d *param, const char *val)
|
||||||
{
|
{
|
||||||
struct eth_device *edev = dev_to_edev(dev);
|
struct eth_device *edev = dev_to_edev(dev);
|
||||||
char ethaddr[sizeof("xx:xx:xx:xx:xx:xx")];
|
u8 ethaddr[6];
|
||||||
|
|
||||||
if (!val)
|
if (!val)
|
||||||
return dev_param_set_generic(dev, param, NULL);
|
return dev_param_set_generic(dev, param, NULL);
|
||||||
|
|
|
@ -159,7 +159,7 @@ void print_IPaddr (IPaddr_t x)
|
||||||
puts(ip_to_string(x));
|
puts(ip_to_string(x));
|
||||||
}
|
}
|
||||||
|
|
||||||
int string_to_ethaddr(const char *str, char *enetaddr)
|
int string_to_ethaddr(const char *str, u8 enetaddr[6])
|
||||||
{
|
{
|
||||||
int reg;
|
int reg;
|
||||||
char *e;
|
char *e;
|
||||||
|
@ -181,7 +181,7 @@ int string_to_ethaddr(const char *str, char *enetaddr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ethaddr_to_string(const unsigned char *enetaddr, char *str)
|
void ethaddr_to_string(const u8 enetaddr[6], char *str)
|
||||||
{
|
{
|
||||||
sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X",
|
sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X",
|
||||||
enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],
|
enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],
|
||||||
|
|
Loading…
Reference in New Issue