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

net: Add an accessor to know if waiting for ARP

Browse Source 
This single-sources the state of the ARP.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Joe Hershberger
2018-09-26 16:48:58 -05:00
parent c67a420781
commit 3f02c98bd1
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net.h
View File

@@ -636,6 +636,7 @@ rxhand_f *net_get_udp_handler(void); /* Get UDP RX packet handler */
void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */ void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */
rxhand_f *net_get_arp_handler(void); /* Get ARP RX packet handler */ rxhand_f *net_get_arp_handler(void); /* Get ARP RX packet handler */
void net_set_arp_handler(rxhand_f *); /* Set ARP RX packet handler */ void net_set_arp_handler(rxhand_f *); /* Set ARP RX packet handler */
bool arp_is_waiting(void); /* Waiting for ARP reply? */
void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */ void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */
void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */ void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */

11
net/arp.c
View File

@@ -100,7 +100,7 @@ int arp_timeout_check(void)
{ {
ulong t; ulong t;
if (!net_arp_wait_packet_ip.s_addr) if (!arp_is_waiting())
return 0; return 0;
t = get_timer(0); t = get_timer(0);
@@ -187,8 +187,8 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
return; return;
case ARPOP_REPLY: /* arp reply */ case ARPOP_REPLY: /* arp reply */
/* are we waiting for a reply */ /* are we waiting for a reply? */
if (!net_arp_wait_packet_ip.s_addr) if (!arp_is_waiting())
break; break;
#ifdef CONFIG_KEEP_SERVERADDR #ifdef CONFIG_KEEP_SERVERADDR
@@ -233,3 +233,8 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
return; return;
} }
} }
bool arp_is_waiting(void)
{
return !!net_arp_wait_packet_ip.s_addr;
}