summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-04-04 18:04:42 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-05 08:56:03 +0200
commit56f6bfb820a61f9aef0964f609b22d0ad73d0bb3 (patch)
tree0c64b6fbae468b88cdcded46650ab0df645605ef
parentf31693eb58089ae16ceb8b0eb34604d83669b360 (diff)
downloadbarebox-56f6bfb820a61f9aef0964f609b22d0ad73d0bb3.tar.gz
barebox-56f6bfb820a61f9aef0964f609b22d0ad73d0bb3.tar.xz
net: arp_request: do not retry endlessly
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/net.h2
-rw-r--r--net/net.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/include/net.h b/include/net.h
index 0ebe19823a..3f2187eca0 100644
--- a/include/net.h
+++ b/include/net.h
@@ -21,6 +21,8 @@
#include <led.h>
#include <asm/byteorder.h> /* for nton* / ntoh* stuff */
+/* How often do we retry to send packages */
+#define PKT_NUM_RETRIES 4
/* The number of receive packet buffers */
#define PKTBUFSRX 4
diff --git a/net/net.c b/net/net.c
index 39db75e7a9..046ddd4077 100644
--- a/net/net.c
+++ b/net/net.c
@@ -223,6 +223,7 @@ static int arp_request(IPaddr_t dest, unsigned char *ether)
uint64_t arp_start;
static char *arp_packet;
struct ethernet *et;
+ unsigned retries = 0;
if (!arp_packet) {
arp_packet = net_alloc_packet();
@@ -277,8 +278,12 @@ static int arp_request(IPaddr_t dest, unsigned char *ether)
printf("T ");
arp_start = get_time_ns();
eth_send(arp_packet, ETHER_HDR_SIZE + ARP_HDR_SIZE);
+ retries++;
}
+ if (retries > PKT_NUM_RETRIES)
+ return -ETIMEDOUT;
+
net_poll();
}