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/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index 7a03520..ca11138 100644
--- a/sys/dev/harp/if_harp.c
+++ b/sys/dev/harp/if_harp.c
@@ -354,7 +354,7 @@ harp_output(Cmn_unit *cu, Cmn_vcc *cv, KBuffer *m)
 		sc->cmn.cu_pif.pif_oerrors++;
 		cv->cv_connvc->cvc_vcc->vc_oerrors++;
 		if (cv->cv_connvc->cvc_vcc->vc_nif)
-			cv->cv_connvc->cvc_vcc->vc_nif->nif_if.if_oerrors++;
+			ANIF2IFP(cv->cv_connvc->cvc_vcc->vc_nif)->if_oerrors++;
 		return;
 	}
 
@@ -365,8 +365,8 @@ harp_output(Cmn_unit *cu, Cmn_vcc *cv, KBuffer *m)
 	cv->cv_connvc->cvc_vcc->vc_obytes += mlen;
 	if (cv->cv_connvc->cvc_vcc->vc_nif) {
 		cv->cv_connvc->cvc_vcc->vc_nif->nif_obytes += mlen;
-		cv->cv_connvc->cvc_vcc->vc_nif->nif_if.if_obytes += mlen;
-		cv->cv_connvc->cvc_vcc->vc_nif->nif_if.if_opackets++;
+		ANIF2IFP(cv->cv_connvc->cvc_vcc->vc_nif)->if_obytes += mlen;
+		ANIF2IFP(cv->cv_connvc->cvc_vcc->vc_nif)->if_opackets++;
 	}
 }
 
@@ -592,8 +592,8 @@ harp_input(struct ifnet *ifp, struct mbuf **mp, struct atm_pseudohdr *ah,
 	vcc->cv_connvc->cvc_vcc->vc_ibytes += mlen;
 	if (vcc->cv_connvc->cvc_vcc->vc_nif) {
 		vcc->cv_connvc->cvc_vcc->vc_nif->nif_ibytes += mlen;
-		vcc->cv_connvc->cvc_vcc->vc_nif->nif_if.if_ipackets++;
-		vcc->cv_connvc->cvc_vcc->vc_nif->nif_if.if_ibytes += mlen;
+		ANIF2IFP(vcc->cv_connvc->cvc_vcc->vc_nif)->if_ipackets++;
+		ANIF2IFP(vcc->cv_connvc->cvc_vcc->vc_nif)->if_ibytes += mlen;
 	}
 
 	/* hand it off */