diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
| commit | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /net/net.c | |
| parent | 446d37c1acc76680770400fd90e6c502e49d72df (diff) | |
| parent | ac1d31380618f3f68bf7f05b73b6ab0cdeab0e9f (diff) | |
| download | u-boot-imx-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.zip u-boot-imx-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.tar.gz u-boot-imx-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |