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, 18 insertions, 12 deletions

diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a48ab8c..d10d859 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -93,7 +93,7 @@
 #define LONAME	"lo"
 
 struct lo_softc {
-	struct	ifnet sc_if;		/* network-visible interface */
+	struct	ifnet *sc_ifp;
 	LIST_ENTRY(lo_softc) sc_next;
 };
 
@@ -129,6 +129,7 @@ lo_clone_destroy(ifp)
 	mtx_unlock(&lo_mtx);
 	bpfdetach(ifp);
 	if_detach(ifp);
+	if_free(ifp);
 	free(sc, M_LO);
 }
 
@@ -137,25 +138,30 @@ lo_clone_create(ifc, unit)
 	struct if_clone *ifc;
 	int unit;
 {
+	struct ifnet *ifp;
 	struct lo_softc *sc;
 
 	MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_WAITOK | M_ZERO);
+	ifp = sc->sc_ifp = if_alloc(IFT_LOOP);
+	if (ifp == NULL) {
+		free(sc, M_LO);
+		return (ENOSPC);
+	}
 
-	if_initname(&sc->sc_if, ifc->ifc_name, unit);
-	sc->sc_if.if_mtu = LOMTU;
-	sc->sc_if.if_flags = IFF_LOOPBACK | IFF_MULTICAST;
-	sc->sc_if.if_ioctl = loioctl;
-	sc->sc_if.if_output = looutput;
-	sc->sc_if.if_type = IFT_LOOP;
-	sc->sc_if.if_snd.ifq_maxlen = ifqmaxlen;
-	sc->sc_if.if_softc = sc;
-	if_attach(&sc->sc_if);
-	bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int));
+	if_initname(ifp, ifc->ifc_name, unit);
+	ifp->if_mtu = LOMTU;
+	ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST;
+	ifp->if_ioctl = loioctl;
+	ifp->if_output = looutput;
+	ifp->if_snd.ifq_maxlen = ifqmaxlen;
+	ifp->if_softc = sc;
+	if_attach(ifp);
+	bpfattach(ifp, DLT_NULL, sizeof(u_int));
 	mtx_lock(&lo_mtx);
 	LIST_INSERT_HEAD(&lo_list, sc, sc_next);
 	mtx_unlock(&lo_mtx);
 	if (loif == NULL)
-		loif = &sc->sc_if;
+		loif = ifp;
 
 	return (0);
 }