xyz-modem: va_start() must be matched by va_end()

[u-boot] / net / net.c

diff --git a/net/net.c b/net/net.c
index 0b876913e35fe89a74d02e76348fe515cec1a2d9..d222c1f2bd42391b0a2f3eed3d7ae106fad1c527 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -108,8 +108,6 @@
 #include "sntp.h"
 #endif
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /** BOOTP EXTENTIONS **/
 
 /* Our subnet mask (0=unknown) */
@@ -683,7 +681,7 @@ int net_start_again(void)
                retry_forever = 0;
        }
 
-       if ((!retry_forever) && (net_try_count >= retrycnt)) {
+       if ((!retry_forever) && (net_try_count > retrycnt)) {
                eth_halt();
                net_set_state(NETLOOP_FAIL);
                /*
@@ -1536,7 +1534,7 @@ ushort string_to_vlan(const char *s)
        return htons(id);
 }
 
-ushort getenv_vlan(char *var)
+ushort env_get_vlan(char *var)
 {
        return string_to_vlan(env_get(var));
 }