diff options
author | Wolfgang Denk <wd@denx.de> | 2008-04-29 23:39:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-29 23:39:42 +0200 |
commit | ca9351280fbc8680bb78707b99651a62e5b196c7 (patch) | |
tree | 62b1c94745ca3e0318c75c7a7346348dc81a827b /net | |
parent | b7fcc4c13993782342cf5cd20d237a6281648a0b (diff) | |
parent | 2ef7503a593c77a80c2a054011970227c4b62774 (diff) | |
download | u-boot-imx-ca9351280fbc8680bb78707b99651a62e5b196c7.zip u-boot-imx-ca9351280fbc8680bb78707b99651a62e5b196c7.tar.gz u-boot-imx-ca9351280fbc8680bb78707b99651a62e5b196c7.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'net')
-rw-r--r-- | net/net.c | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -94,11 +94,22 @@ DECLARE_GLOBAL_DATA_PTR; -#define ARP_TIMEOUT 5UL /* Seconds before trying ARP again */ +#ifndef CONFIG_ARP_TIMEOUT +# define ARP_TIMEOUT 50UL /* Deciseconds before trying ARP again */ +#elif (CONFIG_ARP_TIMEOUT < 100) +# error "Due to possible overflow CONFIG_ARP_TIMEOUT must be greater than 100ms" +#else +# if (CONFIG_ARP_TIMEOUT % 100) +# warning "Supported ARP_TIMEOUT precision is 100ms" +# endif +# define ARP_TIMEOUT (CONFIG_ARP_TIMEOUT / 100) +#endif + + #ifndef CONFIG_NET_RETRY_COUNT -# define ARP_TIMEOUT_COUNT 5 /* # of timeouts before giving up */ +# define ARP_TIMEOUT_COUNT 5 /* # of timeouts before giving up */ #else -# define ARP_TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT) +# define ARP_TIMEOUT_COUNT CONFIG_NET_RETRY_COUNT #endif #if 0 @@ -129,7 +140,7 @@ uchar NetOurEther[6]; /* Our ethernet address */ uchar NetServerEther[6] = /* Boot server enet address */ { 0, 0, 0, 0, 0, 0 }; IPaddr_t NetOurIP; /* Our IP addr (0 = unknown) */ -IPaddr_t NetServerIP; /* Our IP addr (0 = unknown) */ +IPaddr_t NetServerIP; /* Server IP addr (0 = unknown) */ volatile uchar *NetRxPkt; /* Current receive packet */ int NetRxPktLen; /* Current rx packet length */ unsigned NetIPID; /* IP packet ID */ @@ -253,7 +264,7 @@ void ArpTimeoutCheck(void) t = get_timer(0); /* check for arp timeout */ - if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT * CFG_HZ) { + if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT * CFG_HZ / 10) { NetArpWaitTry++; if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) { @@ -494,7 +505,7 @@ restart: * Check the ethernet for a new packet. The ethernet * receive routine will process it. */ - eth_rx(); + eth_rx(); /* * Abort if ctrl-c was pressed. |