diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:05:51 +0200 |
| commit | 80f15899b19032c7bf68f6af996168eacbb19732 (patch) | |
| tree | a618b853ae22cc26296964f0a48022531c22feb8 | |
| parent | 2274c6ea774aa167005fa4fe43419c5a18b531c8 (diff) | |
| parent | fb67ada79add357cf14c919504e27d54d91ca444 (diff) | |
| download | barebox-80f15899b19032c7bf68f6af996168eacbb19732.tar.gz barebox-80f15899b19032c7bf68f6af996168eacbb19732.tar.xz | |
Merge branch 'for-next/ifup'
| -rw-r--r-- | defaultenv/defaultenv-2-base/network/eth0 | 2 | ||||
| -rw-r--r-- | net/ifup.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/defaultenv/defaultenv-2-base/network/eth0 b/defaultenv/defaultenv-2-base/network/eth0 index 7e731cae00..33fe7c1b2b 100644 --- a/defaultenv/defaultenv-2-base/network/eth0 +++ b/defaultenv/defaultenv-2-base/network/eth0 @@ -14,3 +14,5 @@ serverip= #ethaddr=xx:xx:xx:xx:xx:xx # put code to discover eth0 (i.e. 'usb') to /env/network/eth0-discover + +exit 0 diff --git a/net/ifup.c b/net/ifup.c index 7b63136296..409b338ec1 100644 --- a/net/ifup.c +++ b/net/ifup.c @@ -31,7 +31,6 @@ static char *vars[] = { "netmask", "gateway", "serverip", - "ethaddr", }; static int eth_set_param(struct device_d *dev, const char *param) @@ -70,14 +69,18 @@ int ifup(const char *name, unsigned flags) cmd_discover = asprintf("/env/network/%s-discover", name); ret = run_command(cmd); - if (ret) + if (ret) { + pr_err("Running '%s' failed with %d\n", cmd, ret); goto out; + } ret = stat(cmd_discover, &s); if (!ret) { ret = run_command(cmd_discover); - if (ret) + if (ret) { + pr_err("Running '%s' failed with %d\n", cmd, ret); goto out; + } } dev = get_device_by_name(name); |