diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:59:15 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:52:53 -0500 |
| commit | ece223b52ae9ab94f7ae83a9ac49b9f6319a94cb (patch) | |
| tree | 1d2c3ec21e2802f52bb6d95b25ae16ad9d97cad8 /net/arp.c | |
| parent | 22f6e99d5b0c54758646334c1153737a5585bd57 (diff) | |
net: Refactor to separate the UDP handler from the ARP handler
Call a built-in dummy if none is registered... don't require
protocols to register a handler (eliminating dummies)
NetConsole now uses the ARP handler when waiting on arp
(instead of needing a #define hack in arp.c)
Clear handlers at the end of net loop
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net/arp.c')
| -rw-r--r-- | net/arp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/arp.c b/net/arp.c index 997c2abdb35..fcff53602f0 100644 --- a/net/arp.c +++ b/net/arp.c @@ -192,9 +192,9 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) memcpy(NetArpWaitPacketMAC, &arp->ar_sha, ARP_HLEN); -#ifdef CONFIG_NETCONSOLE - NetGetHandler()(0, 0, 0, 0, 0); -#endif + net_get_arp_handler()((uchar *)arp, 0, reply_ip_addr, + 0, len); + /* modify header, and transmit it */ memcpy(((struct ethernet_hdr *)NetArpWaitTxPacket)-> et_dest, NetArpWaitPacketMAC, ARP_HLEN); |