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

diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index 5c63a05..d47b822 100644
--- a/sys/net/firewire.h
+++ b/sys/net/firewire.h
@@ -121,7 +121,7 @@ struct fw_reass {
 STAILQ_HEAD(fw_reass_list, fw_reass);
 
 struct fw_com {
-	struct ifnet		fc_if;
+	struct ifnet		*fc_ifp;
 	struct fw_hwaddr	fc_hwaddr;
 	struct firewire_comm	*fc_fc;
 	uint8_t			fc_broadcast_channel;
@@ -129,6 +129,7 @@ struct fw_com {
 	uint16_t		fc_node;	/* our nodeid */
 	struct fw_reass_list	fc_frags;	/* partial datagrams */
 };
+#define	IFP2FWC(ifp)	((struct fw_com *)(ifp)->if_l2com)
 
 extern	void	firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src);
 extern	void	firewire_ifattach(struct ifnet *, struct fw_hwaddr *);