X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=net%2Fnet.c;h=fba111edfba263846f00e178852740efc3b08349;hb=167f52587173ad87aac7780058d59aa96422eed0;hp=2a6efd85eae2179c97a0f798e0ec881a3d66a3b8;hpb=a31a415803b8850f52d78395103fca3bdd1d37af;p=u-boot

diff --git a/net/net.c b/net/net.c
index 2a6efd85ea..fba111edfb 100644
--- a/net/net.c
+++ b/net/net.c
@@ -83,9 +83,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <environment.h>
 #include <errno.h>
 #include <net.h>
+#include <net/tftp.h>
 #if defined(CONFIG_STATUS_LED)
 #include <miiphy.h>
 #include <status_led.h>
@@ -105,7 +107,6 @@
 #if defined(CONFIG_CMD_SNTP)
 #include "sntp.h"
 #endif
-#include "tftp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -164,7 +165,7 @@ ushort		net_our_vlan = 0xFFFF;
 ushort		net_native_vlan = 0xFFFF;
 
 /* Boot File name */
-char net_boot_file_name[128];
+char net_boot_file_name[1024];
 /* The actual transferred size of the bootfile (in bytes) */
 u32 net_boot_file_size;
 /* Boot file size in blocks as reported by the DHCP server */
@@ -541,6 +542,9 @@ restart:
 #ifdef CONFIG_SHOW_ACTIVITY
 		show_activity(1);
 #endif
+		if (arp_timeout_check() > 0)
+			time_start = get_timer(0);
+
 		/*
 		 *	Check the ethernet for a new packet.  The ethernet
 		 *	receive routine will process it.
@@ -569,8 +573,6 @@ restart:
 			goto done;
 		}
 
-		arp_timeout_check();
-
 		/*
 		 *	Check for a timeout, and run the timeout handler
 		 *	if we have one.