diff options
| author | Luca Ceresoli <luca.ceresoli@comelit.it> | 2011-05-17 00:03:38 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-05-19 21:38:19 +0200 |
| commit | e3fb0abe2befb405428b23d6c0da4682a347b4f7 (patch) | |
| tree | b042f61b9c741f55f79b77f744710e65d81cac18 /net/tftp.c | |
| parent | 20478ceaa295048e220d0963d1c8db5e1d6916fb (diff) | |
| download | olio-uboot-2014.01-e3fb0abe2befb405428b23d6c0da4682a347b4f7.tar.xz olio-uboot-2014.01-e3fb0abe2befb405428b23d6c0da4682a347b4f7.zip | |
TFTP: rename STATE_RRQ to STATE_SEND_RRQ
With the upcoming TFTP server implementation, requests can be either
outgoing or incoming, so avoid ambiguities.
Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Diffstat (limited to 'net/tftp.c')
| -rw-r--r-- | net/tftp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/tftp.c b/net/tftp.c index b9d0f3b0c..6386740b1 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -80,7 +80,7 @@ static int TftpTsize; static short TftpNumchars; #endif -#define STATE_RRQ 1 +#define STATE_SEND_RRQ 1 #define STATE_DATA 2 #define STATE_TOO_LARGE 3 #define STATE_BAD_MAGIC 4 @@ -215,7 +215,7 @@ TftpSend(void) switch (TftpState) { - case STATE_RRQ: + case STATE_SEND_RRQ: xp = pkt; s = (ushort *)pkt; *s++ = htons(TFTP_RRQ); @@ -309,7 +309,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, #endif return; } - if (TftpState != STATE_RRQ && src != TftpRemotePort) + if (TftpState != STATE_SEND_RRQ && src != TftpRemotePort) return; if (len < 2) @@ -399,10 +399,10 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, puts("\n\t "); } - if (TftpState == STATE_RRQ) + if (TftpState == STATE_SEND_RRQ) debug("Server did not acknowledge timeout option!\n"); - if (TftpState == STATE_RRQ || TftpState == STATE_OACK) { + if (TftpState == STATE_SEND_RRQ || TftpState == STATE_OACK) { /* first block received */ TftpState = STATE_DATA; TftpRemotePort = src; @@ -632,7 +632,7 @@ TftpStart(void) TftpRemotePort = WELL_KNOWN_PORT; TftpTimeoutCount = 0; - TftpState = STATE_RRQ; + TftpState = STATE_SEND_RRQ; /* Use a pseudo-random port unless a specific port is set */ TftpOurPort = 1024 + (get_timer(0) % 3072); |