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

diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index 6dc7c6c..ef38138 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -93,15 +93,13 @@ enum _pdq_type_t {
 };
 
 #define	sc_ifmedia	ifmedia
-#define	sc_if		arpcom.ac_if
-#define	sc_bpf		sc_if.if_bpf
 #if 0 /* ALTQ */
 #define	IFQ_DEQUEUE	IF_DEQUEUE
 #define	IFQ_IS_EMPTY(q)	((q)->ifq_len == 0)
 #endif
 
 typedef struct _pdq_os_ctx_t {
-	struct arpcom		arpcom;
+	struct ifnet		*ifp;
 	struct ifmedia		ifmedia;
 	device_t		dev;
 	int			debug;
@@ -152,7 +150,8 @@ typedef struct _pdq_os_ctx_t {
 #define	PDQ_OS_TX_TIMEOUT		5	/* seconds */
 
 #define	PDQ_OS_IFP_TO_SOFTC(ifp)	((pdq_softc_t *) (ifp)->if_softc)
-#define	PDQ_BPF_MTAP(sc, m)		BPF_MTAP(&(sc)->arpcom.ac_if, m)
+#define	PDQ_BPF_MTAP(sc, m)		BPF_MTAP((sc)->ifp, m)
+#define PDQ_IFNET(sc)			((sc)->ifp)
 
 #endif	/* PDQ_OSSUPPORT */