Replace the if_name and if_unit members of struct ifnet with new members

if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.

This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.

Approved By:	re (in principle)
Reviewed By:	njl, imp
Tested On:	i386, amd64, sparc64
Obtained From:	NetBSD (if_xname)

2 files changed, 10 insertions, 10 deletions

diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index f2ea70e..6a30908 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -203,8 +203,8 @@ i4biprattach(void *dummy)
 
 		sc->sc_if.if_softc = sc;
 		sc->sc_state = ST_IDLE;
-		sc->sc_if.if_name = "ipr";
-		sc->sc_if.if_unit = i;
+		if_initname(&sc->sc_if, "ipr", i);
+
 
 #ifdef	IPR_VJ
 		sc->sc_if.if_flags = IFF_POINTOPOINT | IFF_SIMPLEX | IPR_AUTOCOMP;
@@ -287,8 +287,8 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	
 	s = SPLI4B();
 
-	unit = ifp->if_unit;
 	sc = ifp->if_softc;
+	unit = ifp->if_dunit;
 
 	/* check for IP */
 	
@@ -435,7 +435,8 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				if(sc->sc_if.if_flags & IFF_RUNNING)
 				{
 					/* disconnect ISDN line */
-					i4b_l4_drvrdisc(BDRV_IPR, ifp->if_unit);
+					i4b_l4_drvrdisc(BDRV_IPR,
+					    ifp->if_dunit);
 					sc->sc_if.if_flags &= ~IFF_RUNNING;
 				}
 
@@ -513,7 +514,7 @@ iprclearqueues(struct ipr_softc *sc)
 static void
 iprwatchdog(struct ifnet *ifp)
 {
-	int unit = ifp->if_unit;
+	int unit = ifp->if_dunit;
 	struct ipr_softc *sc = ifp->if_softc;
 	bchan_statistics_t bs;
 	
@@ -560,7 +561,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_unit);
+		ipr_tx_queue_empty(sc->sc_if.if_dunit);
 	}
 
 	splx(s);
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index dc60fad..3f374dc 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -68,9 +68,9 @@ __FBSDID("$FreeBSD$");
 #include <i4b/layer4/i4b_l4.h>
 
 #define ISPPP_FMT	"isp%d: "
-#define	ISPPP_ARG(sc)	((sc)->sc_if.if_unit)
+#define	ISPPP_ARG(sc)	((sc)->sc_if.if_dunit)
 #define	PDEVSTATIC	static
-#define IFP2UNIT(ifp)	(ifp)->if_unit
+#define IFP2UNIT(ifp)	(ifp)->if_dunit
 		
 #  define CALLOUT_INIT(chan)		callout_handle_init(chan)
 #  define TIMEOUT(fun, arg, chan, tick)	chan = timeout(fun, arg, tick)
@@ -170,8 +170,7 @@ i4bispppattach(void *dummy)
 		i4bisppp_init_linktab(i);
 		
 		sc->sc_if.if_softc = sc;
-		sc->sc_if.if_name = "isp";
-		sc->sc_if.if_unit = i;
+		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;