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/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 07624b4..43bbb59 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -33,7 +33,7 @@
  * ed_softc: per line info and status
  */
 struct ed_softc {
-	struct arpcom arpcom;	/* ethernet common */
+	struct ifnet *ifp;
 
 	char   *type_str;	/* pointer to type string */
 	u_char  vendor;		/* interface vendor */
@@ -43,6 +43,7 @@ struct ed_softc {
 	u_char  isa16bit;	/* width of access to card 0=8 or 1=16 */
 	u_char  mem_shared;	/* NIC memory is shared with host */
 	u_char  xmit_busy;	/* transmitter is busy */
+	u_char  enaddr[6];
 
 	int	port_rid;	/* resource id for port range */
 	int	port_used;	/* nonzero if ports used */