summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@octopus.labnet.pengutronix.de>2007-11-08 17:06:48 +0100
committerJuergen Beisert <jbe@octopus.labnet.pengutronix.de>2007-11-08 17:06:48 +0100
commit2cb737d95d53235daff19ca76787374af5ec5e7e (patch)
treefa8a6992e5639a44654ea232db4510e896d6cc4a
parent903d775d32042e666f0266039ad63403e17b5fb9 (diff)
downloadbarebox-2cb737d95d53235daff19ca76787374af5ec5e7e.tar.gz
barebox-2cb737d95d53235daff19ca76787374af5ec5e7e.tar.xz
using a consistent ipaddr parameter all over the place
Signed-off-by: Juergen Beisert <jbe@octopus.labnet.pengutronix.de>
-rw-r--r--commands/net.c2
-rw-r--r--net/eth.c2
-rw-r--r--net/net.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/commands/net.c b/commands/net.c
index d12559e13f..25115e4f42 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -54,7 +54,7 @@ static void netboot_update_env (void)
setenv ("rootpath", NetOurRootPath);
if (NetOurIP)
- dev_set_param_ip(eth_current->dev, "ip", NetOurIP);
+ dev_set_param_ip(eth_current->dev, "ipaddr", NetOurIP);
if (NetServerIP)
dev_set_param_ip(eth_current->dev, "serverip", NetServerIP);
diff --git a/net/eth.c b/net/eth.c
index 2f7136b324..95c2428ab1 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -95,7 +95,7 @@ int eth_register(struct eth_device *edev)
return -1;
}
- edev->param_ip.name = "ip";
+ edev->param_ip.name = "ipaddr";
edev->param_ethaddr.name = "ethaddr";
edev->param_gateway.name = "gateway";
edev->param_netmask.name = "netmask";
diff --git a/net/net.c b/net/net.c
index fd2effe4c6..e970238603 100644
--- a/net/net.c
+++ b/net/net.c
@@ -264,7 +264,7 @@ NetLoop(proto_t protocol)
return -1;
}
- ip = dev_get_param_ip(eth_current->dev, "ip");
+ ip = dev_get_param_ip(eth_current->dev, "ipaddr");
NetCopyIP(&NetOurIP, &ip);
/* XXX problem with bss workaround */