diff options
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -227,7 +227,7 @@ static ulong timeDelta; /* THE transmit packet */ volatile uchar *NetTxPacket; -static int net_check_prereq(proto_t protocol); +static int net_check_prereq(enum proto_t protocol); static int NetTryCount; @@ -313,8 +313,7 @@ void ArpTimeoutCheck(void) } } -static void -NetInitLoop(proto_t protocol) +static void NetInitLoop(enum proto_t protocol) { static int env_changed_id; bd_t *bd = gd->bd; @@ -343,8 +342,7 @@ NetInitLoop(proto_t protocol) * Main network processing loop. */ -int -NetLoop(proto_t protocol) +int NetLoop(enum proto_t protocol) { bd_t *bd = gd->bd; int ret = -1; @@ -422,10 +420,11 @@ restart: #ifdef CONFIG_NET_MULTI NetDevExists = 1; #endif + NetBootFileXferSize = 0; switch (protocol) { - case TFTP: + case TFTPGET: /* always use ARP to get server ethernet address */ - TftpStart(); + TftpStart(protocol); break; #ifdef CONFIG_CMD_TFTPSRV case TFTPSRV: @@ -487,7 +486,6 @@ restart: break; } - NetBootFileXferSize = 0; break; } @@ -1790,7 +1788,7 @@ NetReceive(volatile uchar *inpkt, int len) /**********************************************************************/ -static int net_check_prereq(proto_t protocol) +static int net_check_prereq(enum proto_t protocol) { switch (protocol) { /* Fall through */ @@ -1821,7 +1819,7 @@ static int net_check_prereq(proto_t protocol) #if defined(CONFIG_CMD_NFS) case NFS: #endif - case TFTP: + case TFTPGET: if (NetServerIP == 0) { puts("*** ERROR: `serverip' not set\n"); return 1; |