diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-19 13:39:26 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-13 10:48:32 +0200 |
commit | 5e2971204128b4dd7719376e779aab8402151933 (patch) | |
tree | 98cecd357ef163a48364328b42065a5900571cf1 /net/net.c | |
parent | eedb76697921cb0da4bbde96705e75e49b77aea8 (diff) | |
download | barebox-5e2971204128b4dd7719376e779aab8402151933.tar.gz |
net: remove NetStartAgain()
Do not let the network stack restart itself
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'net/net.c')
-rw-r--r-- | net/net.c | 48 |
1 files changed, 3 insertions, 45 deletions
@@ -177,7 +177,6 @@ uchar *NetArpWaitTxPacket; /* THE transmit packet */ int NetArpWaitTxPacketSize; uchar NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; uint64_t NetArpWaitTimerStart; -int NetArpWaitTry; void ArpRequest (void) { @@ -186,7 +185,7 @@ void ArpRequest (void) ARP_t *arp; #ifdef ET_DEBUG - printf ("ARP broadcast %d\n", NetArpWaitTry); + printf ("ARP broadcast\n"); #endif pkt = NetTxPacket; @@ -229,16 +228,8 @@ void ArpTimeoutCheck(void) /* check for arp timeout */ if (is_timeout(NetArpWaitTimerStart, ARP_TIMEOUT)) { - NetArpWaitTry++; - - if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) { - puts ("\nARP Retry count exceeded; starting again\n"); - NetArpWaitTry = 0; - NetStartAgain(); - } else { - NetArpWaitTimerStart = get_time_ns(); - ArpRequest(); - } + NetArpWaitTimerStart = get_time_ns(); + ArpRequest(); } } @@ -436,38 +427,6 @@ restart: } /**********************************************************************/ - -static void -startAgainTimeout(void) -{ - NetState = NETLOOP_RESTART; -} - -static void -startAgainHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) -{ - /* Totally ignore the packet */ -} - -void NetStartAgain (void) -{ - const char *nretry; - int noretry = 0, once = 0; - - if ((nretry = getenv ("netretry")) != NULL) { - noretry = (strcmp (nretry, "no") == 0); - once = (strcmp (nretry, "once") == 0); - } - if (noretry) { - eth_halt (); - NetState = NETLOOP_FAIL; - return; - } - NetSetTimeout (10 * SECOND, startAgainTimeout); - NetSetHandler (startAgainHandler); -} - -/**********************************************************************/ /* * Miscelaneous bits. */ @@ -530,7 +489,6 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) NetArpWaitTxPacketSize = (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE + len; /* and do the ARP request */ - NetArpWaitTry = 1; NetArpWaitTimerStart = get_time_ns(); ArpRequest(); return 1; /* waiting */ |