Merge patch series "Bug-fixes for a few boards"

[J-u-boot.git] / net / tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index 2e335413492b714cdaaa594c2385553f0f19eca5..2e073183d5ab8a0a08a6c59e4e11f4e52eb9a8b8 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -5,7 +5,6 @@
  * Copyright 2011 Comelit Group SpA,
  *                Luca Ceresoli <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <efi_loader.h>
@@ -494,8 +493,15 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
                                tftp_prev_block = tftp_cur_block;
                                tftp_cur_block = (unsigned short)(block + 1);
                                update_block_number();
-                               if (ack_ok)
+                               if (ack_ok) {
+                                       if (block == 0 &&
+                                           tftp_state == STATE_SEND_WRQ){
+                                               /* connection's first ACK */
+                                               tftp_state = STATE_DATA;
+                                               tftp_remote_port = src;
+                                       }
                                        tftp_send(); /* Send next data block */
+                               }
                        }
                }
 #endif
@@ -695,7 +701,6 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
        }
 }
 
-
 static void tftp_timeout_handler(void)
 {
        if (++timeout_count > timeout_count_max) {