From fc74a9f93a5fbc83262aa12084404ac953c854b5 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 10 Jun 2005 16:49:24 +0000 Subject: 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 --- sys/dev/utopia/utopia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/utopia') diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c index 1a9f353795bb..c4416a09306a 100644 --- a/sys/dev/utopia/utopia.c +++ b/sys/dev/utopia/utopia.c @@ -154,14 +154,14 @@ utopia_check_carrier(struct utopia *utp, u_int carr_ok) /* carrier */ utp->carrier = UTP_CARR_OK; if (old != UTP_CARR_OK) { - if_printf(&utp->ifatm->ifnet, "carrier detected\n"); + if_printf(utp->ifatm->ifp, "carrier detected\n"); ATMEV_SEND_IFSTATE_CHANGED(utp->ifatm, 1); } } else { /* no carrier */ utp->carrier = UTP_CARR_LOST; if (old == UTP_CARR_OK) { - if_printf(&utp->ifatm->ifnet, "carrier lost\n"); + if_printf(utp->ifatm->ifp, "carrier lost\n"); ATMEV_SEND_IFSTATE_CHANGED(utp->ifatm, 0); } } @@ -367,7 +367,7 @@ utopia_start(struct utopia *utp) if (reg == (IDTPHY_REGM_MCR_DRIC | IDTPHY_REGM_MCR_EI)) utp->chip = &utopia_chip_idt77105; else { - if_printf(&utp->ifatm->ifnet, + if_printf(utp->ifatm->ifp, "unknown ATM-PHY chip %#x\n", reg); utp->chip = &utopia_chip_unknown; } -- cgit v1.3