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

1 files changed, 4 insertions, 2 deletions

diff --git a/net/net.c b/net/net.c
index a115ce2892..2926bceacb 100644
--- a/net/net.c
+++ b/net/net.c
@@ -164,7 +164,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 */
@@ -569,7 +569,9 @@ restart:
 			goto done;
 		}
 
-		arp_timeout_check();
+		if (arp_timeout_check() > 0) {
+		    time_start = get_timer(0);
+		}
 
 		/*
 		 *	Check for a timeout, and run the timeout handler