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

8 files changed, 40 insertions, 17 deletions

diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/contrib/altq/altq/altq_rio.c
index 6bc4a95..2acf87e 100644
--- a/sys/contrib/altq/altq/altq_rio.c
+++ b/sys/contrib/altq/altq/altq_rio.c
@@ -331,7 +331,7 @@ dscp2index(u_int8_t dscp)
  * use m_pkthdr.rcvif to pass this info.
  */
 #define	RIOM_SET_PRECINDEX(m, idx)	\
-	do { (m)->m_pkthdr.rcvif = (struct ifnet *)((long)(idx)); } while (0)
+	do { (m)->m_pkthdr.rcvif = (void *)((long)(idx)); } while (0)
 #define	RIOM_GET_PRECINDEX(m)	\
 	({ long idx; idx = (long)((m)->m_pkthdr.rcvif); \
 	(m)->m_pkthdr.rcvif = NULL; idx; })
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index a65a092..82d76c4 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -44,6 +44,7 @@
 #include <net/if_arp.h>
 #include <net/iso88025.h>
 #include <net/if_media.h>
+#include <net/if_types.h>
 #include <net/bpf.h>
 
 #ifndef BPF_MTAP
@@ -131,9 +132,15 @@ oltr_attach(device_t dev)
 {
 
 	struct oltr_softc		*sc = device_get_softc(dev);
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct ifnet		*ifp;
 	int		rc = 0;
 	int		media = IFM_TOKEN|IFM_TOK_UTP16;
+
+	ifp = sc->ifp = if_alloc(IFT_ISO88025);
+	if (ifp == NULL) {
+		device_printf(dev, "couldn't if_alloc()");
+		return (-1);
+	}
 	
 	/*
 	 * Allocate interrupt and DMA channel
@@ -164,7 +171,7 @@ oltr_attach(device_t dev)
 	ifp->if_ioctl	= oltr_ioctl;
 	ifp->if_flags	= IFF_BROADCAST | IFF_NEEDSGIANT;
 	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
-	bcopy(sc->config.macaddress, sc->arpcom.ac_enaddr, sizeof(sc->config.macaddress));
+	bcopy(sc->config.macaddress, IFP2ENADDR(sc->ifp), sizeof(sc->config.macaddress));
 
 	/*
 	 * Do ifmedia setup.
@@ -312,7 +319,7 @@ oltr_close(struct oltr_softc *sc)
 void
 oltr_stop(struct oltr_softc *sc)
 {
-	struct ifnet 		*ifp = &sc->arpcom.ac_if;
+	struct ifnet 		*ifp = sc->ifp;
 
 	/*printf("oltr%d: oltr_stop\n", sc->unit);*/
 
@@ -325,7 +332,7 @@ static void
 oltr_init(void * xsc)
 {
 	struct oltr_softc 	*sc = (struct oltr_softc *)xsc;
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct ifnet		*ifp = sc->ifp;
 	struct ifmedia		*ifm = &sc->ifmedia;
 	int			poll = 0, i, rc = 0, s;
 	int			work_size;
@@ -480,7 +487,7 @@ oltr_init(void * xsc)
 	/*
 	 * Open the adapter
 	 */
-	rc = TRlldOpen(sc->TRlldAdapter, sc->arpcom.ac_enaddr, sc->GroupAddress,
+	rc = TRlldOpen(sc->TRlldAdapter, IFP2ENADDR(sc->ifp), sc->GroupAddress,
 		sc->FunctionalAddress, 1552, sc->AdapterMode);
 	switch(rc) {
 		case TRLLD_OPEN_OK:
@@ -739,7 +746,7 @@ static void
 DriverStatus(void *DriverHandle, TRlldStatus_t *Status)
 {
 	struct oltr_softc	*sc = (struct oltr_softc *)DriverHandle;
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct ifnet		*ifp = sc->ifp;
 
 	char *Protocol[] = { /* 0 */ "Unknown",
 			     /* 1 */ "TKP",
@@ -881,7 +888,7 @@ static void
 DriverTransmitFrameCompleted(void *DriverHandle, void *FrameHandle, int TransmitStatus)
 {
 	struct oltr_softc	*sc = (struct oltr_softc *)DriverHandle;
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct ifnet		*ifp = sc->ifp;
 	TRlldTransmit_t		*frame = (TRlldTransmit_t *)FrameHandle;
 	
 	/*printf("oltr%d: DriverTransmitFrameCompleted\n", sc->unit);*/
@@ -908,7 +915,7 @@ static void
 DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount, void *FragmentHandle, int ReceiveStatus)
 {
 	struct oltr_softc 	*sc = (struct oltr_softc *)DriverHandle;
-	struct ifnet		*ifp = (struct ifnet *)&sc->arpcom.ac_if;
+	struct ifnet		*ifp = sc->ifp;
 	struct mbuf		*m0, *m1, *m;
 	int			frame_len = ByteCount, i = (int)FragmentHandle, rc, s;
 	int			mbuf_offset, mbuf_size, frag_offset, copy_length;
diff --git a/sys/contrib/dev/oltr/if_oltr_pci.c b/sys/contrib/dev/oltr/if_oltr_pci.c
index 602a3b2..8c7be2e 100644
--- a/sys/contrib/dev/oltr/if_oltr_pci.c
+++ b/sys/contrib/dev/oltr/if_oltr_pci.c
@@ -233,7 +233,7 @@ static int
 oltr_pci_detach(device_t dev)
 {
 	struct oltr_softc	*sc = device_get_softc(dev);
-	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct ifnet		*ifp = sc->ifp;
 	int s, i;
 
 	device_printf(dev, "driver unloading\n");
@@ -241,6 +241,7 @@ oltr_pci_detach(device_t dev)
 	s = splimp();
 
 	iso88025_ifdetach(ifp, ISO88025_BPF_SUPPORTED);
+	if_free(ifp);
 	if (sc->state > OL_CLOSED)
 		oltr_stop(sc);
 
diff --git a/sys/contrib/dev/oltr/if_oltrvar.h b/sys/contrib/dev/oltr/if_oltrvar.h
index fd8d3de..7b9994d 100644
--- a/sys/contrib/dev/oltr/if_oltrvar.h
+++ b/sys/contrib/dev/oltr/if_oltrvar.h
@@ -68,7 +68,7 @@ struct oltr_tx_buf {
 #define TX_BUFFER_LEN		2048
 
 struct oltr_softc {
-	struct arpcom		arpcom;
+	struct ifnet		*ifp;
 	struct ifmedia		ifmedia;
 	bus_space_handle_t	oltr_bhandle;
 	bus_space_tag_t		oltr_btag;
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;
diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h
index 157dd35..68560e4 100644
--- a/sys/contrib/pf/net/if_pflog.h
+++ b/sys/contrib/pf/net/if_pflog.h
@@ -30,9 +30,11 @@
 #define _NET_IF_PFLOG_H_
 
 struct pflog_softc {
-	struct ifnet	sc_if;  /* the interface */
 #ifdef __FreeBSD__
+	struct ifnet	*sc_ifp;  /* the interface */
 	LIST_ENTRY(pflog_softc) sc_next;
+#else
+	struct ifnet	sc_if;  /* the interface */
 #endif
 };
 
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c
index c40e564..746a6ea 100644
--- a/sys/contrib/pf/net/if_pfsync.c
+++ b/sys/contrib/pf/net/if_pfsync.c
@@ -161,7 +161,7 @@ extern int hz;
 #ifdef __FreeBSD__
 static MALLOC_DEFINE(M_PFSYNC, PFSYNCNAME, "Packet Filter State Sync. Interface");
 static LIST_HEAD(pfsync_list, pfsync_softc) pfsync_list;
-#define	SCP2IFP(sc)		(&(sc)->sc_if)
+#define	SCP2IFP(sc)		((sc)->sc_ifp)
 IFC_SIMPLE_DECLARE(pfsync, 1);
 
 static void
@@ -178,6 +178,7 @@ pfsync_clone_destroy(struct ifnet *ifp)
         bpfdetach(ifp);
 #endif
         if_detach(ifp);
+	if_free(ifp);
         LIST_REMOVE(sc, sc_next);
         free(sc, M_PFSYNC);
 }
@@ -190,6 +191,11 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
 
 	MALLOC(sc, struct pfsync_softc *, sizeof(*sc), M_PFSYNC,
 	    M_WAITOK|M_ZERO);
+	ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC);
+	if (ifp == NULL) {
+		free(sc, M_PFSYNC);
+		return (ENOSPC);
+	}
 
 	pfsync_sync_ok = 1;
 	sc->sc_mbuf = NULL;
@@ -206,7 +212,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
 	ifp->if_ioctl = pfsyncioctl;
 	ifp->if_output = pfsyncoutput;
 	ifp->if_start = pfsyncstart;
-	ifp->if_type = IFT_PFSYNC;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	ifp->if_hdrlen = PFSYNC_HDRLEN;
 	ifp->if_baudrate = IF_Mbps(100);
diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/contrib/pf/net/if_pfsync.h
index e54696b..4a52195 100644
--- a/sys/contrib/pf/net/if_pfsync.h
+++ b/sys/contrib/pf/net/if_pfsync.h
@@ -147,7 +147,11 @@ union sc_statep {
 extern int	pfsync_sync_ok;
 
 struct pfsync_softc {
+#ifdef __FreeBSD__
+	struct ifnet		*sc_ifp;
+#else
 	struct ifnet		 sc_if;
+#endif
 	struct ifnet		*sc_sync_ifp;
 
 	struct ip_moptions	 sc_imo;