diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-08-16 19:33:44 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-08-17 08:49:16 -0600 |
| commit | a58e8d4f602f7024d6ae464febbfc479f9f64e59 (patch) | |
| tree | f54b7061ca43adca17b990591021f2380e02bb39 | |
| parent | 605c08e8b6f7b7e4b9d17b6cb367fb27ce1c511c (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
@@ -195,8 +195,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) && |