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

diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c
index 77b0794..ed5cf13 100644
--- a/sys/contrib/pf/net/if_pflog.c
+++ b/sys/contrib/pf/net/if_pflog.c
@@ -127,7 +127,7 @@ extern int ifqmaxlen;
 #ifdef __FreeBSD__
 static MALLOC_DEFINE(M_PFLOG, PFLOGNAME, "Packet Filter Logging Interface");
 static LIST_HEAD(pflog_list, pflog_softc) pflog_list;
-#define	SCP2IFP(sc)		(&(sc)->sc_if)
+#define	SCP2IFP(sc)		((sc)->sc_ifp)
 IFC_SIMPLE_DECLARE(pflog, 1);
 
 static void
@@ -144,6 +144,7 @@ pflog_clone_destroy(struct ifnet *ifp)
 
 	bpfdetach(ifp);
 	if_detach(ifp);
+	if_free(ifp);
 	LIST_REMOVE(sc, sc_next);
 	free(sc, M_PFLOG);
 }
@@ -155,14 +156,17 @@ pflog_clone_create(struct if_clone *ifc, int unit)
 	struct ifnet *ifp;
 
 	MALLOC(sc, struct pflog_softc *, sizeof(*sc), M_PFLOG, M_WAITOK|M_ZERO);
+	ifp = sc->sc_ifp = if_alloc(IFT_PFLOG);
+	if (ifp == NULL) {
+		free(sc, M_PFLOG);
+		return (ENOSPC);
+	}
 
-	ifp = SCP2IFP(sc);
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_mtu = PFLOGMTU;
 	ifp->if_ioctl = pflogioctl;
 	ifp->if_output = pflogoutput;
 	ifp->if_start = pflogstart;
-	ifp->if_type = IFT_PFLOG;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	ifp->if_hdrlen = PFLOG_HDRLEN;
 	ifp->if_softc = sc;