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, 2 insertions, 2 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 507562b..eefdb3e 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -665,7 +665,7 @@ spansarp_input(clp, m)
 	 * If source IP address is from unspecified or broadcast addresses,
 	 * don't bother updating arp table, but answer possible requests
 	 */
-	if (in_broadcast(in_src, &inp->inf_nif->nif_if))
+	if (in_broadcast(in_src, ANIF2IFP(inp->inf_nif)))
 		goto chkop;
 
 	/*
@@ -1118,7 +1118,7 @@ spansarp_ioctl(code, data, arg1)
 				SATOSIN(&aar.aap_arp_addr)->sin_addr.s_addr =
 					sap->sa_dstip.s_addr;
 				strlcpy(aar.aap_intf,
-					clp->cls_ipnif->inf_nif->nif_if.if_xname,
+					ANIF2IFP(clp->cls_ipnif->inf_nif)->if_xname,
 					sizeof(aar.aap_intf));
 				aar.aap_flags = sap->sa_flags;
 				aar.aap_origin = sap->sa_origin;