Coding Style cleanup, update CHANGELOG, prepare 2008.10-rc3

[karo-tx-uboot.git] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index 1c8aff063352f863035e11d284642d09457687eb..ecf38e4ee5415505564d134dcadd77b9e9f4d981 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -24,13 +24,14 @@
 #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)
+#if defined(CONFIG_CMD_NET)
 
-#define TIMEOUT                5               /* Seconds before trying BOOTP again */
+#define TIMEOUT                5UL             /* Seconds before trying BOOTP again */
 #ifndef        CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
 #else
@@ -46,9 +47,25 @@ int          RarpTry;
 static void
 RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
 {
+       char *s;
 #ifdef DEBUG
-       printf("Got good RARP\n");
+       puts ("Got good RARP\n");
 #endif
+       if ((s = getenv("autoload")) != NULL) {
+               if (*s == 'n') {
+                       /*
+                        * Just use RARP to configure system;
+                        * Do not use TFTP/NFS to to load the bootfile.
+                        */
+                       NetState = NETLOOP_SUCCESS;
+                       return;
+#if defined(CONFIG_CMD_NFS)
+               } else if ((s != NULL) && !strcmp(s, "NFS")) {
+                       NfsStart();
+                       return;
+#endif
+               }
+       }
        TftpStart ();
 }
 
@@ -79,8 +96,7 @@ 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;
 
@@ -97,10 +113,10 @@ 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);
        NetSetHandler(RarpHandler);
 }
 
-#endif /* CFG_CMD_NET */
+#endif