Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index 279e650fcd4466a71bfcb1d426482ff25ed569d1..097f970f442770153cc3f36209c5db26f0737380 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -24,13 +24,12 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include "nfs.h"
 #include "bootp.h"
 #include "rarp.h"
 #include "tftp.h"
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
-
-#define TIMEOUT                5               /* Seconds before trying BOOTP again */
+#define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
 #ifndef        CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
 #else
@@ -44,12 +43,11 @@ int         RarpTry;
  *     Handle a RARP received packet.
  */
 static void
-RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
+RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
+           unsigned dummi3)
 {
-#ifdef DEBUG
-       printf("Got good RARP\n");
-#endif
-       TftpStart ();
+       debug("Got good RARP\n");
+       net_auto_load();
 }
 
 
@@ -63,7 +61,7 @@ RarpTimeout(void)
                puts ("\nRetry count exceeded; starting again\n");
                NetStartAgain ();
        } else {
-               NetSetTimeout (TIMEOUT * CFG_HZ, RarpTimeout);
+               NetSetTimeout (TIMEOUT, RarpTimeout);
                RarpRequest ();
        }
 }
@@ -79,16 +77,15 @@ RarpRequest (void)
        printf("RARP broadcast %d\n", ++RarpTry);
        pkt = NetTxPacket;
 
-       NetSetEther(pkt, NetBcastAddr, PROT_RARP);
-       pkt += ETHER_HDR_SIZE;
+       pkt += NetSetEther(pkt, NetBcastAddr, PROT_RARP);
 
        rarp = (ARP_t *)pkt;
 
-       rarp->ar_hrd = ARP_ETHER;
-       rarp->ar_pro = PROT_IP;
+       rarp->ar_hrd = htons (ARP_ETHER);
+       rarp->ar_pro = htons (PROT_IP);
        rarp->ar_hln = 6;
        rarp->ar_pln = 4;
-       rarp->ar_op  = RARPOP_REQUEST;
+       rarp->ar_op  = htons (RARPOP_REQUEST);
        memcpy (&rarp->ar_data[0],  NetOurEther, 6);    /* source ET addr */
        memcpy (&rarp->ar_data[6],  &NetOurIP,   4);    /* source IP addr */
        memcpy (&rarp->ar_data[10], NetOurEther, 6);    /* dest ET addr = source ET addr ??*/
@@ -97,10 +94,8 @@ RarpRequest (void)
                rarp->ar_data[16 + i] = 0xff;
        }
 
-       NetSendPacket(NetTxPacket, ETHER_HDR_SIZE + ARP_HDR_SIZE);
+       NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
 
-       NetSetTimeout(TIMEOUT * CFG_HZ, RarpTimeout);
+       NetSetTimeout(TIMEOUT, RarpTimeout);
        NetSetHandler(RarpHandler);
 }
-
-#endif /* CFG_CMD_NET */