summaryrefslogtreecommitdiffstats
path: root/sys/netatalk/at_extern.h
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2004-04-25 09:24:52 +0000
committerluigi <luigi@FreeBSD.org>2004-04-25 09:24:52 +0000
commit59063f7a089ed07823309dc56641c8a847f21c23 (patch)
treeb64da6798f0d544a1f0a0369b5c8f192b6c31e34 /sys/netatalk/at_extern.h
parent6430766c7e3512aa8239ab4ffe30ab8faa9dfe7d (diff)
downloadFreeBSD-src-59063f7a089ed07823309dc56641c8a847f21c23.zip
FreeBSD-src-59063f7a089ed07823309dc56641c8a847f21c23.tar.gz
This commit does two things:
1. rt_check() cleanup: rt_check() is only necessary for some address families to gain access to the corresponding arp entry, so call it only in/near the *resolve() routines where it is actually used -- at the moment this is arpresolve(), nd6_storelladdr() (the call is embedded here), and atmresolve() (the call is just before atmresolve to reduce the number of changes). This change will make it a lot easier to decouple the arp table from the routing table. There is an extra call to rt_check() in if_iso88025subr.c to determine the routing info length. I have left it alone for the time being. The interface of arpresolve() and nd6_storelladdr() now changes slightly: + the 'rtentry' parameter (really a hint from the upper level layer) is now passed unchanged from *_output(), so it becomes the route to the final destination and not to the gateway. + the routines will return 0 if resolution is possible, non-zero otherwise. + arpresolve() returns EWOULDBLOCK in case the mbuf is being held waiting for an arp reply -- in this case the error code is masked in the caller so the upper layer protocol will not see a failure. 2. arpcom untangling Where possible, use 'struct ifnet' instead of 'struct arpcom' variables, and use the IFP2AC macro to access arpcom fields. This mostly affects the netatalk code. === Detailed changes: === net/if_arcsubr.c rt_check() cleanup, remove a useless variable net/if_atmsubr.c rt_check() cleanup net/if_ethersubr.c rt_check() cleanup, arpcom untangling net/if_fddisubr.c rt_check() cleanup, arpcom untangling net/if_iso88025subr.c rt_check() cleanup netatalk/aarp.c arpcom untangling, remove a block of duplicated code netatalk/at_extern.h arpcom untangling netinet/if_ether.c rt_check() cleanup (change arpresolve) netinet6/nd6.c rt_check() cleanup (change nd6_storelladdr)
Diffstat (limited to 'sys/netatalk/at_extern.h')
-rw-r--r--sys/netatalk/at_extern.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h
index 8afdad1..bbb1bc9 100644
--- a/sys/netatalk/at_extern.h
+++ b/sys/netatalk/at_extern.h
@@ -6,7 +6,7 @@ struct sockaddr_at;
#ifdef _NET_IF_ARP_H_
extern timeout_t aarpprobe;
-extern int aarpresolve (struct arpcom *,
+extern int aarpresolve (struct ifnet *,
struct mbuf *,
struct sockaddr_at *,
u_char *);
OpenPOWER on IntegriCloud