Prepare v2012.07-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
net: Make sure the ethaddr is updated in net_init()
2012-07-27 08:27:18 +02:00 · 2012-07-24 14:09:40 -05:00
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -24,7 +24,7 @@
 VERSION = 2012
 PATCHLEVEL = 07
 SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
--- a/net/net.c
+++ b/net/net.c
@ -256,6 +256,7 @@ static void NetInitLoop(void)
 #endif
 		env_changed_id = env_id;
 	}
+	memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);

 	return;
 }
@ -322,8 +323,6 @@ int NetLoop(enum proto_t protocol)
 	}

 restart:
-	memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
-
 	net_set_state(NETLOOP_CONTINUE);

 	/*