* Patch by Matthew S. McClintock, 14 Apr 2004:

[u-boot] / net / tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index 3ba15ab625fba00acafcb6329b4ca62253ee096c..5a5ae22ac85b367ac7f83d190fbc31fac0f158b0 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -111,7 +111,7 @@ TftpSend (void)
         *      We will always be sending some sort of packet, so
         *      cobble together the packet headers now.
         */
-       pkt = NetTxPacket + ETHER_HDR_SIZE + IP_HDR_SIZE;
+       pkt = NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE;
 
        switch (TftpState) {
 
@@ -205,10 +205,10 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                TftpBlock = ntohs(*(ushort *)pkt);
 
                /*
-                 * RFC1350 specifies that the first data packet will
-                 * have sequence number 1. If we receive a sequence
-                 * number of 0 this means that there was a wrap
-                 * around of the (16 bit) counter.
+                * RFC1350 specifies that the first data packet will
+                * have sequence number 1. If we receive a sequence
+                * number of 0 this means that there was a wrap
+                * around of the (16 bit) counter.
                 */
                if (TftpBlock == 0) {
                        TftpBlockWrap++;
@@ -224,7 +224,7 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
 
 #ifdef ET_DEBUG
                if (TftpState == STATE_RRQ) {
-                       printf("Server did not acknowledge timeout option!\n");
+                       puts ("Server did not acknowledge timeout option!\n");
                }
 #endif