Stop embedding struct ifnet at the top of driver softcs. Instead the

struct ifnet or the layer 2 common structure it was embedded in have
been replaced with a struct ifnet pointer to be filled by a call to the
new function, if_alloc(). The layer 2 common structure is also allocated
via if_alloc() based on the interface type. It is hung off the new
struct ifnet member, if_l2com.

This change removes the size of these structures from the kernel ABI and
will allow us to better manage them as interfaces come and go.

Other changes of note:
 - Struct arpcom is no longer referenced in normal interface code.
   Instead the Ethernet address is accessed via the IFP2ENADDR() macro.
   To enforce this ac_enaddr has been renamed to _ac_enaddr.
 - The second argument to ether_ifattach is now always the mac address
   from driver private storage rather than sometimes being ac_enaddr.

Reviewed by:	sobomax, sam

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 4d2a4e1..6806491 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -196,7 +196,7 @@ aarpwhohas(struct ifnet *ifp, struct sockaddr_at *sat)
     ea->aarp_hln = sizeof(ea->aarp_sha);
     ea->aarp_pln = sizeof(ea->aarp_spu);
     ea->aarp_op = htons(AARPOP_REQUEST);
-    bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t)ea->aarp_sha,
+    bcopy(IFP2ENADDR(ifp), (caddr_t)ea->aarp_sha,
 	    sizeof(ea->aarp_sha));
 
     /*
@@ -360,8 +360,8 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m)
     ea = mtod(m, struct ether_aarp *);
 
     /* Check to see if from my hardware address */
-    if (!bcmp((caddr_t)ea->aarp_sha, IFP2AC(ifp)->ac_enaddr,
-	    sizeof(IFP2AC(ifp)->ac_enaddr))) {
+    if (!bcmp((caddr_t)ea->aarp_sha, IFP2ENADDR(ifp),
+	    sizeof(IFP2ENADDR(ifp)))) {
 	m_freem(m);
 	return;
     }
@@ -484,7 +484,7 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m)
 
     bcopy((caddr_t)ea->aarp_sha, (caddr_t)ea->aarp_tha,
 	    sizeof(ea->aarp_sha));
-    bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t)ea->aarp_sha,
+    bcopy(IFP2ENADDR(ifp), (caddr_t)ea->aarp_sha,
 	    sizeof(ea->aarp_sha));
 
     /* XXX */
@@ -630,7 +630,7 @@ aarpprobe(void *arg)
     ea->aarp_hln = sizeof(ea->aarp_sha);
     ea->aarp_pln = sizeof(ea->aarp_spu);
     ea->aarp_op = htons(AARPOP_PROBE);
-    bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t)ea->aarp_sha,
+    bcopy(IFP2ENADDR(ifp), (caddr_t)ea->aarp_sha,
 	    sizeof(ea->aarp_sha));
 
     eh = (struct ether_header *)sa.sa_data;