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

[u-boot] / net / net.c

diff --git a/net/net.c b/net/net.c
index b8648bd95aace2e8069bd5bb4335367893a93c24..5637cf54f6d64efe21a8a168b050262d51a83756 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -209,8 +209,6 @@ uchar               NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
 ulong          NetArpWaitTimerStart;
 int            NetArpWaitTry;
 
-int            env_changed_id = 0;
-
 void ArpRequest (void)
 {
        int i;
@@ -278,9 +276,10 @@ void ArpTimeoutCheck(void)
        }
 }
 
-int
+static void
 NetInitLoop(proto_t protocol)
 {
+       static int env_changed_id = 0;
        bd_t *bd = gd->bd;
        int env_id = get_env_id ();
 
@@ -295,7 +294,7 @@ NetInitLoop(proto_t protocol)
                env_changed_id = env_id;
        }
 
-       return 0;
+       return;
 }
 
 /**********************************************************************/