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)

1 files changed, 5 insertions, 6 deletions

diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 93a4899..3a9c99c 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -796,18 +796,17 @@ if_tx_rdy(struct ifnet *ifp)
 	if (p->ifp == ifp)
 	    break ;
     if (p == NULL) {
-	char buf[32];
-	sprintf(buf, "%s%d",ifp->if_name, ifp->if_unit);
 	for (p = all_pipes; p ; p = p->next )
-	    if (!strcmp(p->if_name, buf) ) {
+	    if (!strcmp(p->if_name, ifp->if_xname) ) {
 		p->ifp = ifp ;
-		DPRINTF(("dummynet: ++ tx rdy from %s (now found)\n", buf));
+		DPRINTF(("dummynet: ++ tx rdy from %s (now found)\n",
+			ifp->if_xname));
 		break ;
 	    }
     }
     if (p != NULL) {
-	DPRINTF(("dummynet: ++ tx rdy from %s%d - qlen %d\n", ifp->if_name,
-		ifp->if_unit, ifp->if_snd.ifq_len));
+	DPRINTF(("dummynet: ++ tx rdy from %s - qlen %d\n", ifp->if_xname,
+		ifp->if_snd.ifq_len));
 	p->numbytes = 0 ; /* mark ready for I/O */
 	ready_event_wfq(p);
     }