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

2 files changed, 149 insertions, 151 deletions

diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 7f8adbd..bf8ee2c 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -33,17 +33,17 @@
  *
  *	statistics counter usage (interface lifetime):
  *	----------------------------------------------
- *	sc->sc_if.if_ipackets	# of received packets
- *	sc->sc_if.if_ierrors	# of error packets not going to upper layers
- *	sc->sc_if.if_opackets	# of transmitted packets
- *	sc->sc_if.if_oerrors	# of error packets not being transmitted
- *	sc->sc_if.if_collisions	# of invalid ip packets after VJ decompression
- *	sc->sc_if.if_ibytes	# of bytes coming in from the line (before VJ)
- *	sc->sc_if.if_obytes	# of bytes going out to the line (after VJ)
- *	sc->sc_if.if_imcasts	  (currently unused)
- *	sc->sc_if.if_omcasts	# of frames sent out of the fastqueue
- *	sc->sc_if.if_iqdrops	# of frames dropped on input because queue full
- *	sc->sc_if.if_noproto	# of frames dropped on output because !AF_INET
+ *	sc->sc_ifp->if_ipackets	# of received packets
+ *	sc->sc_ifp->if_ierrors	# of error packets not going to upper layers
+ *	sc->sc_ifp->if_opackets	# of transmitted packets
+ *	sc->sc_ifp->if_oerrors	# of error packets not being transmitted
+ *	sc->sc_ifp->if_collisions	# of invalid ip packets after VJ decompression
+ *	sc->sc_ifp->if_ibytes	# of bytes coming in from the line (before VJ)
+ *	sc->sc_ifp->if_obytes	# of bytes going out to the line (after VJ)
+ *	sc->sc_ifp->if_imcasts	  (currently unused)
+ *	sc->sc_ifp->if_omcasts	# of frames sent out of the fastqueue
+ *	sc->sc_ifp->if_iqdrops	# of frames dropped on input because queue full
+ *	sc->sc_ifp->if_noproto	# of frames dropped on output because !AF_INET
  *
  *	statistics counter usage (connection lifetime):
  *	-----------------------------------------------
@@ -124,7 +124,7 @@ static drvr_link_t ipr_drvr_linktab[NI4BIPR];
 static isdn_link_t *isdn_linktab[NI4BIPR];
 
 struct ipr_softc {
-	struct ifnet	sc_if;		/* network-visible interface	*/
+	struct ifnet	*sc_ifp;	/* network-visible interface	*/
 	int		sc_state;	/* state of the interface	*/
 	call_desc_t	*sc_cdp;	/* ptr to call descriptor	*/
 	int		sc_updown;	/* soft state of interface	*/
@@ -202,43 +202,46 @@ i4biprattach(void *dummy)
 
 		NDBGL4(L4_DIALST, "setting dial state to ST_IDLE");
 
-		sc->sc_if.if_softc = sc;
+		sc->sc_ifp = if_alloc(IFT_ISDNBASIC);
+		if (sc->sc_ifp == NULL)
+			panic("if_ipr.c, ipr_attach: cannot if_alloc()");
+
+		sc->sc_ifp->if_softc = sc;
 		sc->sc_state = ST_IDLE;
-		if_initname(&sc->sc_if, "ipr", i);
+		if_initname(sc->sc_ifp, "ipr", i);
 
 
 #ifdef	IPR_VJ
-		sc->sc_if.if_flags = IFF_POINTOPOINT | IFF_SIMPLEX | IPR_AUTOCOMP;
+		sc->sc_ifp->if_flags = IFF_POINTOPOINT | IFF_SIMPLEX | IPR_AUTOCOMP;
 #else
-		sc->sc_if.if_flags = IFF_POINTOPOINT | IFF_SIMPLEX;
+		sc->sc_ifp->if_flags = IFF_POINTOPOINT | IFF_SIMPLEX;
 #endif
 
-		sc->sc_if.if_mtu = I4BIPRMTU;
-		sc->sc_if.if_type = IFT_ISDNBASIC;
-		sc->sc_if.if_ioctl = i4biprioctl;
-		sc->sc_if.if_output = i4biproutput;
+		sc->sc_ifp->if_mtu = I4BIPRMTU;
+		sc->sc_ifp->if_ioctl = i4biprioctl;
+		sc->sc_ifp->if_output = i4biproutput;
 
-		sc->sc_if.if_snd.ifq_maxlen = I4BIPRMAXQLEN;
+		sc->sc_ifp->if_snd.ifq_maxlen = I4BIPRMAXQLEN;
 		sc->sc_fastq.ifq_maxlen = I4BIPRMAXQLEN;
 
 		if(!mtx_initialized(&sc->sc_fastq.ifq_mtx))
 			mtx_init(&sc->sc_fastq.ifq_mtx, "i4b_ipr_fastq", NULL, MTX_DEF);
 
-		sc->sc_if.if_ipackets = 0;
-		sc->sc_if.if_ierrors = 0;
-		sc->sc_if.if_opackets = 0;
-		sc->sc_if.if_oerrors = 0;
-		sc->sc_if.if_collisions = 0;
-		sc->sc_if.if_ibytes = 0;
-		sc->sc_if.if_obytes = 0;
-		sc->sc_if.if_imcasts = 0;
-		sc->sc_if.if_omcasts = 0;
-		sc->sc_if.if_iqdrops = 0;
-		sc->sc_if.if_noproto = 0;
+		sc->sc_ifp->if_ipackets = 0;
+		sc->sc_ifp->if_ierrors = 0;
+		sc->sc_ifp->if_opackets = 0;
+		sc->sc_ifp->if_oerrors = 0;
+		sc->sc_ifp->if_collisions = 0;
+		sc->sc_ifp->if_ibytes = 0;
+		sc->sc_ifp->if_obytes = 0;
+		sc->sc_ifp->if_imcasts = 0;
+		sc->sc_ifp->if_omcasts = 0;
+		sc->sc_ifp->if_iqdrops = 0;
+		sc->sc_ifp->if_noproto = 0;
 
 #if I4BIPRACCT
-		sc->sc_if.if_timer = 0;	
-		sc->sc_if.if_watchdog = iprwatchdog;	
+		sc->sc_ifp->if_timer = 0;	
+		sc->sc_ifp->if_watchdog = iprwatchdog;	
 		sc->sc_iinb = 0;
 		sc->sc_ioutb = 0;
 		sc->sc_inb = 0;
@@ -267,9 +270,9 @@ i4biprattach(void *dummy)
 		sc->sc_dialresp = DSTAT_NONE;	/* no response */
 		sc->sc_lastdialresp = DSTAT_NONE;
 		
-		if_attach(&sc->sc_if);
+		if_attach(sc->sc_ifp);
 
-		bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int));
+		bpfattach(sc->sc_ifp, DLT_NULL, sizeof(u_int));
 	}
 }
 
@@ -298,8 +301,8 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 		if_printf(ifp, "af%d not supported\n", dst->sa_family);
 		m_freem(m);
 		splx(s);
-		sc->sc_if.if_noproto++;
-		sc->sc_if.if_oerrors++;
+		sc->sc_ifp->if_noproto++;
+		sc->sc_ifp->if_oerrors++;
 		return(EAFNOSUPPORT);
 	}
 
@@ -310,7 +313,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 		NDBGL4(L4_IPRDBG, "ipr%d: interface is DOWN!", unit);
 		m_freem(m);
 		splx(s);
-		sc->sc_if.if_oerrors++;
+		sc->sc_ifp->if_oerrors++;
 		return(ENETDOWN);
 	}
 
@@ -328,7 +331,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 				iprclearqueues(sc);
 				sc->sc_dialresp = DSTAT_NONE;
 				splx(s);
-				sc->sc_if.if_oerrors++;
+				sc->sc_ifp->if_oerrors++;
 				return(ENETUNREACH);
 				break;
 
@@ -338,7 +341,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 				iprclearqueues(sc);
 				sc->sc_dialresp = DSTAT_NONE;
 				splx(s);
-				sc->sc_if.if_oerrors++;
+				sc->sc_ifp->if_oerrors++;
 				return(EHOSTUNREACH);				
 				break;
 
@@ -348,7 +351,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 				iprclearqueues(sc);
 				sc->sc_dialresp = DSTAT_NONE;
 				splx(s);
-				sc->sc_if.if_oerrors++;
+				sc->sc_ifp->if_oerrors++;
 				return(EHOSTUNREACH);				
 				break;
 		}
@@ -370,7 +373,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 
 	/* update access time */
 	
-	microtime(&sc->sc_if.if_lastchange);
+	microtime(&sc->sc_ifp->if_lastchange);
 
 	/*
 	 * check, if type of service indicates interactive, i.e. telnet,
@@ -383,7 +386,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	if(ip->ip_tos & IPTOS_LOWDELAY)
 		ifq = &sc->sc_fastq;
 	else
-	        ifq = (struct ifqueue *)&sc->sc_if.if_snd;
+	        ifq = (struct ifqueue *)&sc->sc_ifp->if_snd;
 
 	/* check for space in choosen send queue */
 	
@@ -391,7 +394,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	{
 		NDBGL4(L4_IPRDBG, "ipr%d: send queue full!", unit);
 		splx(s);
-		sc->sc_if.if_oerrors++;
+		sc->sc_ifp->if_oerrors++;
 		return(ENOBUFS);
 	}
 	
@@ -426,19 +429,19 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			if(ifa->ifa_addr->sa_family != AF_INET)
 				error = EAFNOSUPPORT;
 			else
-				sc->sc_if.if_flags |= IFF_UP;
-			microtime(&sc->sc_if.if_lastchange);
+				sc->sc_ifp->if_flags |= IFF_UP;
+			microtime(&sc->sc_ifp->if_lastchange);
 			break;
 
 		case SIOCSIFFLAGS:	/* set interface flags */
 			if(!(ifr->ifr_flags & IFF_UP))
 			{
-				if(sc->sc_if.if_flags & IFF_RUNNING)
+				if(sc->sc_ifp->if_flags & IFF_RUNNING)
 				{
 					/* disconnect ISDN line */
 					i4b_l4_drvrdisc(BDRV_IPR,
 					    ifp->if_dunit);
-					sc->sc_if.if_flags &= ~IFF_RUNNING;
+					sc->sc_ifp->if_flags &= ~IFF_RUNNING;
 				}
 
 				sc->sc_state = ST_IDLE;
@@ -453,7 +456,7 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				/* enable debug messages */
 			}
 			
-			microtime(&sc->sc_if.if_lastchange);
+			microtime(&sc->sc_ifp->if_lastchange);
 			break;
 
 		case SIOCSIFMTU:	/* set interface MTU */
@@ -464,7 +467,7 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			else
 			{
 				ifp->if_mtu = ifr->ifr_mtu;
-				microtime(&sc->sc_if.if_lastchange);
+				microtime(&sc->sc_ifp->if_lastchange);
 			}
 			break;
 #if 0
@@ -504,7 +507,7 @@ iprclearqueues(struct ipr_softc *sc)
 
 	x = splimp();
 	IF_DRAIN(&sc->sc_fastq);
-	IF_DRAIN(&sc->sc_if.if_snd);
+	IF_DRAIN(&sc->sc_ifp->if_snd);
 	splx(x);
 }
         
@@ -543,7 +546,7 @@ iprwatchdog(struct ifnet *ifp)
 		i4b_l4_accounting(BDRV_IPR, unit, ACCT_DURING,
 			 sc->sc_ioutb, sc->sc_iinb, ro, ri, sc->sc_outb, sc->sc_inb);
  	}
-	sc->sc_if.if_timer = I4BIPRACCTINTVL; 	
+	sc->sc_ifp->if_timer = I4BIPRACCTINTVL; 	
 }
 #endif /* I4BIPRACCT */
 
@@ -562,7 +565,7 @@ i4bipr_connect_startio(struct ipr_softc *sc)
 	if(sc->sc_state == ST_CONNECTED_W)
 	{
 		sc->sc_state = ST_CONNECTED_A;
-		ipr_tx_queue_empty(sc->sc_if.if_dunit);
+		ipr_tx_queue_empty(sc->sc_ifp->if_dunit);
 	}
 
 	splx(s);
@@ -583,7 +586,7 @@ ipr_connect(int unit, void *cdp)
 
 	NDBGL4(L4_DIALST, "ipr%d: setting dial state to ST_CONNECTED", unit);
 
-	sc->sc_if.if_flags |= IFF_RUNNING;
+	sc->sc_ifp->if_flags |= IFF_RUNNING;
 	sc->sc_state = ST_CONNECTED_W;
 
 	sc->sc_dialresp = DSTAT_NONE;
@@ -596,7 +599,7 @@ ipr_connect(int unit, void *cdp)
 	sc->sc_outb = 0;
 	sc->sc_linb = 0;
 	sc->sc_loutb = 0;
-	sc->sc_if.if_timer = I4BIPRACCTINTVL;
+	sc->sc_ifp->if_timer = I4BIPRACCTINTVL;
 #endif
 
 #ifdef I4BIPRADJFRXP
@@ -658,7 +661,7 @@ ipr_disconnect(int unit, void *cdp)
 	}
 
 #if I4BIPRACCT
-	sc->sc_if.if_timer = 0;
+	sc->sc_ifp->if_timer = 0;
 #endif
 
 #if IPR_LOG
@@ -676,7 +679,7 @@ ipr_disconnect(int unit, void *cdp)
 	sc->sc_dialresp = DSTAT_NONE;
 	sc->sc_lastdialresp = DSTAT_NONE;	
 
-	sc->sc_if.if_flags &= ~IFF_RUNNING;
+	sc->sc_ifp->if_flags &= ~IFF_RUNNING;
 	sc->sc_state = ST_IDLE;
 }
 
@@ -732,11 +735,11 @@ ipr_rx_data_rdy(int unit)
 	if((m = *isdn_linktab[unit]->rx_mbuf) == NULL)
 		return;
 
-	m->m_pkthdr.rcvif = &sc->sc_if;
+	m->m_pkthdr.rcvif = sc->sc_ifp;
 
 	m->m_pkthdr.len = m->m_len;
 
-	microtime(&sc->sc_if.if_lastchange);
+	microtime(&sc->sc_ifp->if_lastchange);
 
 #ifdef I4BIPRADJFRXP
 
@@ -767,8 +770,8 @@ ipr_rx_data_rdy(int unit)
 	}
 #endif
 		
-	sc->sc_if.if_ipackets++;
-	sc->sc_if.if_ibytes += m->m_pkthdr.len;
+	sc->sc_ifp->if_ipackets++;
+	sc->sc_ifp->if_ibytes += m->m_pkthdr.len;
 
 #ifdef	IPR_VJ
 	if((c = (*(mtod(m, u_char *)) & 0xf0)) != (IPVERSION << 4))
@@ -801,7 +804,7 @@ ipr_rx_data_rdy(int unit)
 		 * it's a reasonable packet, decompress it and then
 		 * enable compression.  Otherwise, drop it.
 		 */
-		if(sc->sc_if.if_flags & IPR_COMPRESS)
+		if(sc->sc_ifp->if_flags & IPR_COMPRESS)
 		{
 #ifdef IPR_VJ_USEBUFFER
 			len = sl_uncompress_tcp(&cp,len,(u_int)c,&sc->sc_compr);
@@ -818,7 +821,7 @@ ipr_rx_data_rdy(int unit)
 				goto error;
 			}
 		}
-		else if((sc->sc_if.if_flags & IPR_AUTOCOMP) &&
+		else if((sc->sc_ifp->if_flags & IPR_AUTOCOMP) &&
 			(c == TYPE_UNCOMPRESSED_TCP) && (len >= 40))
 		{
 #ifdef IPR_VJ_USEBUFFER
@@ -836,7 +839,7 @@ ipr_rx_data_rdy(int unit)
 				goto error;
 			}
 
-			sc->sc_if.if_flags |= IPR_COMPRESS;
+			sc->sc_ifp->if_flags |= IPR_COMPRESS;
 		}
 		else
 		{
@@ -845,8 +848,8 @@ ipr_rx_data_rdy(int unit)
 #endif
 
 error:
-			sc->sc_if.if_ierrors++;
-			sc->sc_if.if_collisions++;
+			sc->sc_ifp->if_ierrors++;
+			sc->sc_ifp->if_collisions++;
 			m_freem(m);
 			return;
 		}
@@ -871,7 +874,7 @@ error:
 	}
 #endif
 
-	if(sc->sc_if.if_bpf)
+	if(sc->sc_ifp->if_bpf)
 	{
 		/* prepend the address family as a four byte field */		
 		struct mbuf mm;
@@ -879,14 +882,14 @@ error:
 		mm.m_next = m;
 		mm.m_len = 4;
 		mm.m_data = (char *)&af;
-		BPF_MTAP(&sc->sc_if, &mm);
+		BPF_MTAP(sc->sc_ifp, &mm);
 	}
 
 	if(netisr_queue(NETISR_IP, m))	/* (0) on success. */
 	{
 		NDBGL4(L4_IPRDBG, "ipr%d: ipintrq full!", unit);
-		sc->sc_if.if_ierrors++;
-		sc->sc_if.if_iqdrops++;		
+		sc->sc_ifp->if_ierrors++;
+		sc->sc_ifp->if_iqdrops++;		
 	}
 }
 
@@ -913,18 +916,18 @@ ipr_tx_queue_empty(int unit)
                 IF_DEQUEUE(&sc->sc_fastq, m);
                 if(m)
                 {
-			sc->sc_if.if_omcasts++;
+			sc->sc_ifp->if_omcasts++;
 		}
 		else
 		{
-			IF_DEQUEUE(&sc->sc_if.if_snd, m);
+			IF_DEQUEUE(&sc->sc_ifp->if_snd, m);
 			if(m == NULL)
 				break;
 		}
 
-		microtime(&sc->sc_if.if_lastchange);
+		microtime(&sc->sc_ifp->if_lastchange);
 		
-		if(sc->sc_if.if_bpf)
+		if(sc->sc_ifp->if_bpf)
 		{
 			/* prepend the address family as a four byte field */
 	
@@ -933,7 +936,7 @@ ipr_tx_queue_empty(int unit)
 			mm.m_next = m;
 			mm.m_len = 4;
 			mm.m_data = (char *)&af;
-			BPF_MTAP(&sc->sc_if, &mm);
+			BPF_MTAP(sc->sc_ifp, &mm);
 		}
 	
 #if I4BIPRACCT
@@ -943,7 +946,7 @@ ipr_tx_queue_empty(int unit)
 #ifdef IPR_VJ	
 		if((ip = mtod(m, struct ip *))->ip_p == IPPROTO_TCP)
 		{
-			if(sc->sc_if.if_flags & IPR_COMPRESS)
+			if(sc->sc_ifp->if_flags & IPR_COMPRESS)
 			{
 				*mtod(m, u_char *) |= sl_compress_tcp(m, ip,
 					&sc->sc_compr, 1);
@@ -960,9 +963,9 @@ ipr_tx_queue_empty(int unit)
 		}
 		else
 		{
-			sc->sc_if.if_obytes += m->m_pkthdr.len;
+			sc->sc_ifp->if_obytes += m->m_pkthdr.len;
 
-			sc->sc_if.if_opackets++;
+			sc->sc_ifp->if_opackets++;
 
 			_IF_ENQUEUE(isdn_linktab[unit]->tx_queue, m);
 
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index f8d6fce..a7e2f0e 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 NET_NEEDS_GIANT("i4b_isppp");
 
 #define ISPPP_FMT	"isp%d: "
-#define	ISPPP_ARG(sc)	((sc)->sc_if.if_dunit)
+#define	ISPPP_ARG(sc)	(sc->sc_ifp->if_dunit)
 #define	PDEVSTATIC	static
 #define IFP2UNIT(ifp)	(ifp)->if_dunit
 		
@@ -90,18 +90,7 @@ PSEUDO_SET(i4bispppattach, i4b_isppp);
 #define PPP_HDRLEN   		4	/* 4 octetts PPP header length	*/
 
 struct i4bisppp_softc {
-	/*
-	 * struct sppp starts with a struct ifnet, but we gotta allocate
-	 * more space for it.  NB: do not relocate this union, it must
-	 * be first in isppp_softc.  The tls and tlf hooks below want to
-	 * convert a ``struct sppp *'' into a ``struct isppp_softc *''.
-	 */
-	union {
-		struct ifnet scu_if;
-		struct sppp scu_sp;
-	} sc_if_un;
-
-#define sc_if sc_if_un.scu_if
+	struct ifnet *sc_ifp;
 
 	int	sc_state;	/* state of the interface	*/
 	call_desc_t *sc_cdp;	/* ptr to call descriptor	*/
@@ -161,6 +150,7 @@ PDEVSTATIC void
 i4bispppattach(void *dummy)
 {
 	struct i4bisppp_softc *sc = i4bisppp_softc;
+	struct ifnet *ifp;
 	int i;
 
 #ifdef SPPP_VJ
@@ -171,40 +161,49 @@ i4bispppattach(void *dummy)
 
 	for(i = 0; i < NI4BISPPP; sc++, i++) {
 		i4bisppp_init_linktab(i);
+		ifp = sc->sc_ifp = if_alloc(IFT_PPP);
+		if (ifp == NULL) {
+			panic("isp%d: cannot if_alloc()", i);
+		}
 		
-		sc->sc_if.if_softc = sc;
-		if_initname(&sc->sc_if, "isp", i);
-		sc->sc_if.if_mtu = PP_MTU;
-		sc->sc_if.if_flags = IFF_SIMPLEX | IFF_POINTOPOINT;
-		sc->sc_if.if_type = IFT_ISDNBASIC;
+		ifp->if_softc = sc;
+		if_initname(sc->sc_ifp, "isp", i);
+		ifp->if_mtu = PP_MTU;
+		ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT;
+		/*
+		 * XXX: If there were a detach function this would
+		 * require that it use if_free_type().  Not sure if this
+		 * type makes sense.
+		 */
+		ifp->if_type = IFT_ISDNBASIC;
 		sc->sc_state = ST_IDLE;
 
-		sc->sc_if.if_ioctl = i4bisppp_ioctl;
+		ifp->if_ioctl = i4bisppp_ioctl;
 
 		/* actually initialized by sppp_attach() */
-		/* sc->sc_if.if_output = sppp_output; */
-
-		sc->sc_if.if_start = i4bisppp_start;
-
-		sc->sc_if.if_hdrlen = 0;
-		sc->sc_if.if_addrlen = 0;
-		sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
-
-		sc->sc_if.if_ipackets = 0;
-		sc->sc_if.if_ierrors = 0;
-		sc->sc_if.if_opackets = 0;
-		sc->sc_if.if_oerrors = 0;
-		sc->sc_if.if_collisions = 0;
-		sc->sc_if.if_ibytes = 0;
-		sc->sc_if.if_obytes = 0;
-		sc->sc_if.if_imcasts = 0;
-		sc->sc_if.if_omcasts = 0;
-		sc->sc_if.if_iqdrops = 0;
-		sc->sc_if.if_noproto = 0;
+		/* ifp->if_output = sppp_output; */
+
+		ifp->if_start = i4bisppp_start;
+
+		ifp->if_hdrlen = 0;
+		ifp->if_addrlen = 0;
+		ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+
+		ifp->if_ipackets = 0;
+		ifp->if_ierrors = 0;
+		ifp->if_opackets = 0;
+		ifp->if_oerrors = 0;
+		ifp->if_collisions = 0;
+		ifp->if_ibytes = 0;
+		ifp->if_obytes = 0;
+		ifp->if_imcasts = 0;
+		ifp->if_omcasts = 0;
+		ifp->if_iqdrops = 0;
+		ifp->if_noproto = 0;
 
 #if I4BISPPPACCT
-		sc->sc_if.if_timer = 0;	
-		sc->sc_if.if_watchdog = i4bisppp_watchdog;	
+		ifp->if_timer = 0;	
+		ifp->if_watchdog = i4bisppp_watchdog;	
 		sc->sc_iinb = 0;
 		sc->sc_ioutb = 0;
 		sc->sc_inb = 0;
@@ -214,22 +213,18 @@ i4bispppattach(void *dummy)
 		sc->sc_fn = 1;
 #endif
 
-		sc->sc_if_un.scu_sp.pp_tls = i4bisppp_tls;
-		sc->sc_if_un.scu_sp.pp_tlf = i4bisppp_tlf;
-		sc->sc_if_un.scu_sp.pp_con = i4bisppp_negotiation_complete;
-		sc->sc_if_un.scu_sp.pp_chg = i4bisppp_state_changed;
+		IFP2SP(sc->sc_ifp)->pp_tls = i4bisppp_tls;
+		IFP2SP(sc->sc_ifp)->pp_tlf = i4bisppp_tlf;
+		IFP2SP(sc->sc_ifp)->pp_con = i4bisppp_negotiation_complete;
+		IFP2SP(sc->sc_ifp)->pp_chg = i4bisppp_state_changed;
 
-		sppp_attach(&sc->sc_if);
+		sppp_attach(sc->sc_ifp);
 
-#if 0 /* ??? -hm */
-		ether_ifattach(&sc->sc_if, 0);
-#else
-		if_attach(&sc->sc_if);
-#endif
+		if_attach(sc->sc_ifp);
 
 		CALLOUT_INIT(&sc->sc_ch);
 		
-		bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN);
+		bpfattach(sc->sc_ifp, DLT_PPP, PPP_HDRLEN);
 	}
 }
 
@@ -248,7 +243,7 @@ i4bisppp_ioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data)
 
 	int error;
 
-	error = sppp_ioctl(&sc->sc_if, cmd, data);
+	error = sppp_ioctl(sc->sc_ifp, cmd, data);
 	if (error)
 		return error;
 
@@ -289,7 +284,7 @@ i4bisppp_start(struct ifnet *ifp)
 	 * splx(s);
 	 */
 
-	while ((m = sppp_dequeue(&sc->sc_if)) != NULL)
+	while ((m = sppp_dequeue(sc->sc_ifp)) != NULL)
 	{
 
 		BPF_MTAP(ifp, m);
@@ -305,10 +300,10 @@ i4bisppp_start(struct ifnet *ifp)
 		else
 		{
 #if 0
-			sc->sc_if.if_obytes += m->m_pkthdr.len;
+			sc->sc_ifp->if_obytes += m->m_pkthdr.len;
 #endif
 			sc->sc_outb += m->m_pkthdr.len;
-			sc->sc_if.if_opackets++;
+			sc->sc_ifp->if_opackets++;
 
 			_IF_ENQUEUE(isdn_linktab[unit]->tx_queue, m);
 		}
@@ -351,7 +346,7 @@ i4bisppp_watchdog(struct ifnet *ifp)
 		i4b_l4_accounting(BDRV_ISPPP, unit, ACCT_DURING,
 			 sc->sc_ioutb, sc->sc_iinb, ro, ri, sc->sc_outb, sc->sc_inb);
  	}
-	sc->sc_if.if_timer = I4BISPPPACCTINTVL; 	
+	sc->sc_ifp->if_timer = I4BISPPPACCTINTVL; 	
 
 #if 0 /* old stuff, keep it around */
 	printf(ISPPP_FMT "transmit timeout\n", ISPPP_ARG(sc));
@@ -385,7 +380,7 @@ static void
 i4bisppp_tls(struct sppp *sp)
 {
 	struct i4bisppp_softc *sc = (struct i4bisppp_softc *)sp;
-	struct ifnet *ifp = (struct ifnet *)sp;
+	struct ifnet *ifp = SP2IFP(sp);
 
 	if(sc->sc_state == ST_CONNECTED)
 		return;
@@ -402,7 +397,7 @@ i4bisppp_tlf(struct sppp *sp)
 {
 	struct i4bisppp_softc *sc = (struct i4bisppp_softc *)sp;
 /*	call_desc_t *cd = sc->sc_cdp;	*/
-        struct ifnet *ifp = (struct ifnet *)sp;	
+        struct ifnet *ifp = SP2IFP(sp);
 	
 	if(sc->sc_state != ST_CONNECTED)
 		return;
@@ -448,7 +443,7 @@ static void
 i4bisppp_connect(int unit, void *cdp)
 {
 	struct i4bisppp_softc *sc = &i4bisppp_softc[unit];
-	struct sppp *sp = &sc->sc_if_un.scu_sp;
+	struct sppp *sp = IFP2SP(sc->sc_ifp);
 	int s = splimp();
 
 	sc->sc_cdp = (call_desc_t *)cdp;
@@ -461,7 +456,7 @@ i4bisppp_connect(int unit, void *cdp)
 	sc->sc_outb = 0;
 	sc->sc_linb = 0;
 	sc->sc_loutb = 0;
-	sc->sc_if.if_timer = I4BISPPPACCTINTVL;
+	sc->sc_ifp->if_timer = I4BISPPPACCTINTVL;
 #endif
 	
 #if 0 /* never used ??? */
@@ -483,7 +478,7 @@ i4bisppp_disconnect(int unit, void *cdp)
 {
 	call_desc_t *cd = (call_desc_t *)cdp;
 	struct i4bisppp_softc *sc = &i4bisppp_softc[unit];
-	struct sppp *sp = &sc->sc_if_un.scu_sp;
+	struct sppp *sp = IFP2SP(sc->sc_ifp);
 
 	int s = splimp();
 
@@ -496,7 +491,7 @@ i4bisppp_disconnect(int unit, void *cdp)
 	}
 
 #if I4BISPPPACCT
-	sc->sc_if.if_timer = 0;
+	sc->sc_ifp->if_timer = 0;
 #endif
 
 	i4b_l4_accounting(BDRV_ISPPP, unit, ACCT_FINAL,
@@ -524,7 +519,7 @@ static void
 i4bisppp_dialresponse(int unit, int status, cause_t cause)
 {
 	struct i4bisppp_softc *sc = &i4bisppp_softc[unit];
-	struct sppp *sp = &sc->sc_if_un.scu_sp;
+	struct sppp *sp = IFP2SP(sc->sc_ifp);
 
 	NDBGL4(L4_ISPDBG, "isp%d: status=%d, cause=%d", unit, status, cause);
 
@@ -534,9 +529,9 @@ i4bisppp_dialresponse(int unit, int status, cause_t cause)
 		
 		NDBGL4(L4_ISPDBG, "isp%d: clearing queues", unit);
 
-		if(!(sppp_isempty(&sc->sc_if)))
+		if(!(sppp_isempty(sc->sc_ifp)))
 		{
-			while((m = sppp_dequeue(&sc->sc_if)) != NULL)
+			while((m = sppp_dequeue(sc->sc_ifp)) != NULL)
 				m_freem(m);
 		}
 
@@ -579,14 +574,14 @@ i4bisppp_rx_data_rdy(int unit)
 	if((m = *isdn_linktab[unit]->rx_mbuf) == NULL)
 		return;
 
-	m->m_pkthdr.rcvif = &sc->sc_if;
+	m->m_pkthdr.rcvif = sc->sc_ifp;
 	m->m_pkthdr.len = m->m_len;
 
-	microtime(&sc->sc_if.if_lastchange);
+	microtime(&sc->sc_ifp->if_lastchange);
 
-	sc->sc_if.if_ipackets++;
+	sc->sc_ifp->if_ipackets++;
 #if 0
-	sc->sc_if.if_ibytes += m->m_pkthdr.len;
+	sc->sc_ifp->if_ibytes += m->m_pkthdr.len;
 #endif
 
 #if I4BISPPPACCT
@@ -597,11 +592,11 @@ i4bisppp_rx_data_rdy(int unit)
 	printf("i4bisppp_rx_data_ready: received packet!\n");
 #endif
 
-	BPF_MTAP(&sc->sc_if, m);
+	BPF_MTAP(sc->sc_ifp, m);
 
 	s = splimp();
 
-	sppp_input(&sc->sc_if, m);
+	sppp_input(sc->sc_ifp, m);
 
 	splx(s);
 }
@@ -614,7 +609,7 @@ i4bisppp_rx_data_rdy(int unit)
 static void
 i4bisppp_tx_queue_empty(int unit)
 {
-	i4bisppp_start(&i4bisppp_softc[unit].sc_if);	
+	i4bisppp_start((&i4bisppp_softc[unit])->sc_ifp);	
 }
 
 /*---------------------------------------------------------------------------*