kill arcnet leftovers, some pt out by Mike Belopuhov <mkb@crypt.org.ru>,

some I found afterwards, ok dlg

4 files changed, 7 insertions, 39 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index 3c2ab061e81..0852b5c425b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.160 2007/06/06 10:04:36 henning Exp $	*/
+/*	$OpenBSD: if.c,v 1.161 2007/06/08 09:31:38 henning Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -1338,10 +1338,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
 			    (caddr_t)((struct arpcom *)ifp)->ac_enaddr,
 			    ETHER_ADDR_LEN);
 			/* FALLTHROUGH */
-		case IFT_ARCNET:
-			bcopy((caddr_t)ifr->ifr_addr.sa_data,
-			    LLADDR(sdl), ETHER_ADDR_LEN);
-			break;
 		default:
 			return (ENODEV);
 		}
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 03e8f264835..073a781ea4e 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_ifattach.c,v 1.44 2006/11/15 03:07:44 itojun Exp $	*/
+/*	$OpenBSD: in6_ifattach.c,v 1.45 2007/06/08 09:31:38 henning Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -202,22 +202,6 @@ found:
 		}
 		break;
 
-	case IFT_ARCNET:
-		if (addrlen != 1)
-			return -1;
-		if (!addr[0])
-			return -1;
-
-		bzero(&in6->s6_addr[8], 8);
-		in6->s6_addr[15] = addr[0];
-
-		/*
-		 * due to insufficient bitwidth, we mark it local.
-		 */
-		in6->s6_addr[8] &= ~EUI64_GBIT;	/* g bit to "individual" */
-		in6->s6_addr[8] |= EUI64_UBIT;	/* u bit to "local" */
-		break;
-
 	case IFT_GIF:
 		/*
 		 * RFC2893 says: "SHOULD use IPv4 address as ifid source".
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index b574f0889d8..6d69d2463be 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.73 2007/05/28 22:17:21 pyr Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.74 2007/06/08 09:31:38 henning Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -187,17 +187,10 @@ nd6_setmtu0(ifp, ndi)
 
 	omaxmtu = ndi->maxmtu;
 
-	switch (ifp->if_type) {
-	case IFT_ARCNET:
-		ndi->maxmtu = MIN(60480, ifp->if_mtu); /* RFC2497 */
-		break;
-	case IFT_FDDI:
+	if (ifp->if_type == IFT_FDDI)
 		ndi->maxmtu = MIN(FDDIMTU, ifp->if_mtu);
-		break;
-	default:
+	else
 		ndi->maxmtu = ifp->if_mtu;
-		break;
-	}
 
 	/*
 	 * Decreasing the interface MTU under IPV6 minimum MTU may cause
@@ -1919,13 +1912,12 @@ nd6_need_cache(ifp)
 {
 	/*
 	 * XXX: we currently do not make neighbor cache on any interface
-	 * other than ARCnet, Ethernet, FDDI and GIF.
+	 * other than Ethernet, FDDI and GIF.
 	 *
 	 * RFC2893 says:
 	 * - unidirectional tunnels needs no ND
 	 */
 	switch (ifp->if_type) {
-	case IFT_ARCNET:
 	case IFT_ETHER:
 	case IFT_FDDI:
 	case IFT_IEEE1394:
@@ -1958,9 +1950,6 @@ nd6_storelladdr(ifp, rt, m, dst, desten)
 						 desten);
 			return (1);
 			break;
-		case IFT_ARCNET:
-			*desten = 0;
-			return (1);
 		default:
 			m_freem(m);
 			return (0);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index d56c86376c3..411bc6fb3f2 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_nbr.c,v 1.44 2007/06/01 00:52:38 henning Exp $	*/
+/*	$OpenBSD: nd6_nbr.c,v 1.45 2007/06/08 09:31:38 henning Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -996,7 +996,6 @@ nd6_ifptomac(ifp)
 	struct ifnet *ifp;
 {
 	switch (ifp->if_type) {
-	case IFT_ARCNET:
 	case IFT_ETHER:
 	case IFT_FDDI:
 	case IFT_IEEE1394: