Merge branch 'master' of git://git.denx.de/u-boot-mmc

[karo-tx-uboot.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 7a93542122cb14be38c276e3d4a23d8cc1d8b91a..7a6058339cccaf8a21879a685c837a0a10fc5695 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -321,7 +321,8 @@ NetInitLoop(proto_t protocol)
 
        /* update only when the environment has changed */
        if (env_changed_id != env_id) {
-               NetCopyIP(&NetOurIP, &bd->bi_ip_addr);
+               NetOurIP = getenv_IPaddr("ipaddr");
+               NetCopyIP(&bd->bi_ip_addr, &NetOurIP);
                NetOurGatewayIP = getenv_IPaddr("gatewayip");
                NetOurSubnetMask = getenv_IPaddr("netmask");
                NetServerIP = getenv_IPaddr("serverip");