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, 1 insertions, 11 deletions

diff --git a/sys/net/net_osdep.c b/sys/net/net_osdep.c
index 7cfb14290737..90601e20a051 100644
--- a/sys/net/net_osdep.c
+++ b/sys/net/net_osdep.c
@@ -53,15 +53,5 @@ const char *
 if_name(ifp)
 	struct ifnet *ifp;
 {
-#define MAXNUMBUF	8
-	static char nam[MAXNUMBUF][IFNAMSIZ + 10];	/*enough?*/
-	static int ifbufround = 0;
-	char *cp;
-
-	ifbufround = (ifbufround + 1) % MAXNUMBUF;
-	cp = nam[ifbufround];
-
-	snprintf(cp, IFNAMSIZ + 10, "%s%d", ifp->if_name, ifp->if_unit);
-	return ((const char *)cp);
-#undef MAXNUMBUF
+	return ifp->if_xname;
 }