summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 11:00:33 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 11:00:33 +0200
commit149d4764a30436b6de4073966c01376c234c215a (patch)
tree6317281865ac79ee3695d7018b3b0ce37424d77b /net
parenta461805f26bf25883bcaa3a4cfe2b8ffe5a3dde1 (diff)
parent69e07e2afb650702dad23bea882731fe02dbb964 (diff)
downloadbarebox-149d4764a30436b6de4073966c01376c234c215a.tar.gz
barebox-149d4764a30436b6de4073966c01376c234c215a.tar.xz
Merge branch 'for-next/ethernet'
Diffstat (limited to 'net')
-rw-r--r--net/eth.c2
-rw-r--r--net/net.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/eth.c b/net/eth.c
index e023d65322..c034eaae25 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -167,7 +167,7 @@ int eth_rx(void)
static int eth_set_ethaddr(struct device_d *dev, struct param_d *param, const char *val)
{
struct eth_device *edev = dev_to_edev(dev);
- char ethaddr[sizeof("xx:xx:xx:xx:xx:xx")];
+ u8 ethaddr[6];
if (!val)
return dev_param_set_generic(dev, param, NULL);
diff --git a/net/net.c b/net/net.c
index c803c48a38..54d8c25d49 100644
--- a/net/net.c
+++ b/net/net.c
@@ -159,7 +159,7 @@ void print_IPaddr (IPaddr_t 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;
char *e;
@@ -181,7 +181,7 @@ int string_to_ethaddr(const char *str, char *enetaddr)
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",
enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],