* Add support for RMU board

[people/ms/u-boot.git] / net / tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index 0ad244fd97bc27daa281c0320fa6d72ff60f31b2..5598be32f130550de43a2fb2fd1298deb7103d82 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -142,10 +142,7 @@ TftpSend (void)
                break;
        }
 
-       NetSetEther (NetTxPacket, NetServerEther, PROT_IP);
-       NetSetIP (NetTxPacket + ETHER_HDR_SIZE, NetServerIP,
-                                       TftpServerPort, TftpOurPort, len);
-       NetSendPacket (NetTxPacket, ETHER_HDR_SIZE + IP_HDR_SIZE + len);
+       NetSendUDPPacket(NetServerEther, NetServerIP, TftpServerPort, TftpOurPort, len);
 }
 
 
@@ -257,17 +254,6 @@ TftpTimeout (void)
 void
 TftpStart (void)
 {
-#ifdef ET_DEBUG
-       printf ("\nServer ethernet address %02x:%02x:%02x:%02x:%02x:%02x\n",
-               NetServerEther[0],
-               NetServerEther[1],
-               NetServerEther[2],
-               NetServerEther[3],
-               NetServerEther[4],
-               NetServerEther[5]
-       );
-#endif /* DEBUG */
-
        if (BootFile[0] == '\0') {
                IPaddr_t OurIP = ntohl(NetOurIP);
 
@@ -320,6 +306,9 @@ TftpStart (void)
        TftpState = STATE_RRQ;
        TftpOurPort = 1024 + (get_timer(0) % 3072);
 
+       /* zero out server ether in case the server ip has changed */
+       memset(NetServerEther, 0, 6);
+
        TftpSend ();
 }