diff options
| author | Simon Glass <sjg@chromium.org> | 2011-10-24 18:00:02 +0000 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-17 17:09:51 -0800 |
| commit | 52d640d58d0bba723df03de4493cdcab167ca2ee (patch) | |
| tree | 744de14e4752c84655929a6a54237a597c7b66c3 /include/net.h | |
| parent | da7491fc37940f82c15b44b03dfd209502235756 (diff) | |
BACKPORT: net: tftpput: Rename TFTP to TFTPGET
This is a better name for this protocol. Also remove the typedef to keep
checkpatch happy, and move zeroing of NetBootFileXferSize a little
earlier since TFTPPUT will need to change this.
(cherry-picked from e4bf0c5)
Change-Id: I90d03045de0231553a693f7119bdcc67a908e3c9
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/11796
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net.h b/include/net.h index 9e3a8f5f4d0..c5a1c65fbc2 100644 --- a/include/net.h +++ b/include/net.h @@ -383,8 +383,10 @@ extern int NetState; /* Network loop state */ extern int NetRestartWrap; /* Tried all network devices */ #endif -typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, - TFTPSRV } proto_t; +enum proto_t { + BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, + TFTPSRV +}; /* from net/net.c */ extern char BootFile[128]; /* Boot File name */ @@ -410,7 +412,7 @@ extern int NetTimeOffset; /* offset time from UTC */ #endif /* Initialize the network adapter */ -extern int NetLoop(proto_t); +extern int NetLoop(enum proto_t); /* Shutdown adapters and cleanup */ extern void NetStop(void); |