diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:23 +0200 |
| commit | 11a0b5a0dd5f092777de41db00f3ffa8a95d698c (patch) | |
| tree | 519db270d85dbbab4dab0928ed43a0c156436093 /net/rarp.c | |
| parent | 3533c30ef469bd5e6ff1f715fcaae4a64066e612 (diff) | |
| download | barebox-11a0b5a0dd5f092777de41db00f3ffa8a95d698c.tar.gz barebox-11a0b5a0dd5f092777de41db00f3ffa8a95d698c.tar.xz | |
svn_rev_108
removed ifdefs, moved ping to own file, fix timeout handler
Diffstat (limited to 'net/rarp.c')
| -rw-r--r-- | net/rarp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/rarp.c b/net/rarp.c index 33d2f65486..e4efa2476c 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -23,14 +23,13 @@ #include <common.h> #include <command.h> +#include <clock.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 */ #ifndef CONFIG_NET_RETRY_COUNT # define TIMEOUT_COUNT 5 /* # of timeouts before giving up */ @@ -47,7 +46,6 @@ int RarpTry; static void RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3) { - char *s; #ifdef DEBUG puts ("Got good RARP\n"); #endif @@ -65,7 +63,7 @@ RarpTimeout(void) puts ("\nRetry count exceeded; starting again\n"); NetStartAgain (); } else { - NetSetTimeout (TIMEOUT * CFG_HZ, RarpTimeout); + NetSetTimeout (TIMEOUT * SECOND, RarpTimeout); RarpRequest (); } } @@ -100,8 +98,7 @@ RarpRequest (void) NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE); - NetSetTimeout(TIMEOUT * CFG_HZ, RarpTimeout); + NetSetTimeout(TIMEOUT * SECOND, RarpTimeout); NetSetHandler(RarpHandler); } -#endif /* CFG_CMD_NET */ |