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

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index a1a487b..476e026 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/if_ether.h>
 #include <net/if_bridgevar.h>
 
-#define sc_if ifb_ac.ac_if
-
 /* BPDU message types */
 #define	BSTP_MSGTYPE_CFG	0x00		/* Configuration */
 #define	BSTP_MSGTYPE_TCN	0x80		/* Topology chg notification */
@@ -1139,7 +1137,7 @@ bstp_tick(void *arg)
 			bstp_hold_timer_expiry(sc, bif);
 	}
 
-	if (sc->sc_if.if_flags & IFF_RUNNING)
+	if (sc->sc_ifp->if_flags & IFF_RUNNING)
 		callout_reset(&sc->sc_bstpcallout, hz, bstp_tick, sc);
 
 	BRIDGE_UNLOCK(sc);