No need for net/net_osdep.h

1 files changed, 15 insertions, 16 deletions

diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 7d222266f81..df723fccad1 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_ifattach.c,v 1.16 2001/02/16 15:59:38 itojun Exp $	*/
+/*	$OpenBSD: in6_ifattach.c,v 1.17 2001/06/09 06:43:37 angelos Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.112 2001/02/10 15:44:59 jinmei Exp $	*/
 
 /*
@@ -54,8 +54,6 @@
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 
-#include <net/net_osdep.h>
-
 struct in6_ifstat **in6_ifstat = NULL;
 struct icmp6_ifstat **icmp6_ifstat = NULL;
 size_t in6_ifstatmax = 0;
@@ -260,15 +258,16 @@ get_ifid(ifp0, altifp, in6)
 
 	/* first, try to get it from the interface itself */
 	if (get_hw_ifid(ifp0, in6) == 0) {
-		nd6log((LOG_DEBUG, "%s: got interface identifier from itself\n",
-		    if_name(ifp0)));
+		nd6log((LOG_DEBUG,
+		    "%s: got interface identifier from itself\n",
+		    ifp0->if_xname));
 		goto success;
 	}
 
 	/* try secondary EUI64 source. this basically is for ATM PVC */
 	if (altifp && get_hw_ifid(altifp, in6) == 0) {
 		nd6log((LOG_DEBUG, "%s: got interface identifier from %s\n",
-		    if_name(ifp0), if_name(altifp)));
+		    ifp0->if_xname, altifp->if_xname));
 		goto success;
 	}
 
@@ -287,7 +286,7 @@ get_ifid(ifp0, altifp, in6)
 		if (IFID_UNIVERSAL(in6)) {
 			nd6log((LOG_DEBUG,
 			    "%s: borrow interface identifier from %s\n",
-			    if_name(ifp0), if_name(ifp)));
+			    ifp0->if_xname, ifp->if_xname));
 			goto success;
 		}
 	}
@@ -296,17 +295,17 @@ get_ifid(ifp0, altifp, in6)
 	if (get_rand_ifid(ifp, in6) == 0) {
 		nd6log((LOG_DEBUG,
 		    "%s: interface identifier generated by random number\n",
-		    if_name(ifp0)));
+		    ifp0->if_xname));
 		goto success;
 	}
 
-	printf("%s: failed to get interface identifier\n", if_name(ifp0));
+	printf("%s: failed to get interface identifier\n", ifp0->if_xname);
 	return -1;
 
 success:
 	nd6log((LOG_INFO, "%s: ifid: "
 		"%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-		if_name(ifp0),
+		ifp0->if_xname,
 		in6->s6_addr[8], in6->s6_addr[9],
 		in6->s6_addr[10], in6->s6_addr[11],
 		in6->s6_addr[12], in6->s6_addr[13],
@@ -368,10 +367,10 @@ in6_ifattach_addaddr(ifp, ia)
 	if (error) {
 		switch (error) {
 		case EAFNOSUPPORT:
-			printf("%s: IPv6 not supported\n", if_name(ifp));
+			printf("%s: IPv6 not supported\n", ifp->if_xname);
 			break;
 		default:
-			printf("%s: SIOCSIFADDR error %d\n", if_name(ifp),
+			printf("%s: SIOCSIFADDR error %d\n", ifp->if_xname,
 			    error);
 			break;
 		}
@@ -493,7 +492,7 @@ in6_ifattach_linklocal(ifp, altifp)
 	} else {
 		if (get_ifid(ifp, altifp, &ia->ia_addr.sin6_addr) != 0) {
 			nd6log((LOG_ERR,
-			    "%s: no ifid available\n", if_name(ifp)));
+			    "%s: no ifid available\n", ifp->if_xname));
 			free(ia, M_IFADDR);
 			return -1;
 		}
@@ -652,7 +651,7 @@ in6_ifattach(ifp, altifp)
 	 */
 	if ((ifp->if_flags & IFF_MULTICAST) == 0) {
 		printf("%s: not multicast capable, IPv6 not enabled\n",
-		    if_name(ifp));
+		    ifp->if_xname);
 		return;
 	}
 
@@ -667,7 +666,7 @@ in6_ifattach(ifp, altifp)
 
 		if (ia == NULL) {
 			printf("%s: failed to add link-local address\n",
-			    if_name(ifp));
+			    ifp->if_xname);
 
 			/* we can't initialize multicasts without link-local */
 			goto statinit;
@@ -861,7 +860,7 @@ in6_ifdetach(ifp)
 			else {
 				nd6log((LOG_ERR, 
 				    "%s: didn't unlink in6ifaddr from "
-				    "list\n", if_name(ifp)));
+				    "list\n", ifp->if_xname));
 			}
 		}