leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/arp: account for ARP delay, avoid duplicate packets on timeout

Browse Source 
eth_rx() in the main reception loop may trigger sending a packet which
is already timed out (or will immediately) upon reception of an ARP reply.
As long as the ARP reply is pending, the timeout handler of a packet
should be postponed.
Happens on TFTP with bad network (e.g. WLAN).

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Stefan Brüns 2015-08-30 17:46:54 +02:00 committed by Joe Hershberger
parent 943231119f
commit 45b47734a0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/arp.c
View File

@ -96,12 +96,12 @@ void arp_request(void)
arp_raw_request(net_ip, net_null_ethaddr, net_arp_wait_reply_ip);
}
void arp_timeout_check(void)
int arp_timeout_check(void)
{
ulong t;
if (!net_arp_wait_packet_ip.s_addr)
return;
return 0;
t = get_timer(0);
@ -118,6 +118,7 @@ void arp_timeout_check(void)
arp_request();
}
}
return 1;
}
void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)

2
net/arp.h
View File

@ -25,7 +25,7 @@ void arp_init(void);
void arp_request(void);
void arp_raw_request(struct in_addr source_ip, const uchar *targetEther,
struct in_addr target_ip);
void arp_timeout_check(void);
int arp_timeout_check(void);
void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len);
#endif /* __ARP_H__ */

4
net/net.c
View File

@ -569,7 +569,9 @@ restart:
goto done;
}
arp_timeout_check();
if (arp_timeout_check() > 0) {
time_start = get_timer(0);
}
/*
* Check for a timeout, and run the timeout handler