diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-08-16 19:33:44 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 07:10:43 -0600 |
| commit | 011bb5b7cf01676514dd5e17fbbd545ff1c835ab (patch) | |
| tree | 3ae0b4e8c2eca92b06c99b4be099eb0729007248 | |
| parent | e5ed0576e4ab9cb6468404e37da579135a797dac (diff) | |
net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
Ignore the return value of eth_getenv_enetaddr_by_index(), and if it
fails, fall back to use dev->enetaddr, which could be filled up by
the ethernet device driver.
Actually, this is the original behavior, and was later changed by
commit 48506a2cde2458fa1f8c5993afc98e5a4617e1d3.
Signed-off-by: Eric Miao <eric.miao@linaro.org>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | net/eth.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -197,8 +197,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, unsigned char env_enetaddr[6]; int ret = 0; - if (!eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr)) - return -1; + eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr); if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) { if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) && |