remove remaining IPX hooks. all inside #ifdef IPX, so no actual change

10 files changed, 12 insertions, 134 deletions

diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 1370d67d99e..cbef1eb1b1a 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Make.tags.inc,v 1.10 2007/06/01 05:37:14 deraadt Exp $
+#	$OpenBSD: Make.tags.inc,v 1.11 2007/06/06 10:04:36 henning Exp $
 
 # Common files for "make tags".
 # Included by the Makefile for each architecture.
@@ -22,7 +22,6 @@ COMM=	$S/altq/*.[ch] \
 	$S/netatalk/*.[ch] \
 	$S/netinet/*.[ch] \
 	$S/netinet6/*.[ch] \
-	$S/netipx/*.[ch] \
 	$S/netnatm/*.[ch] \
 	$S/nfs/*.[ch] \
 	$S/scsi/*.[ch] \
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index c0b9c15798c..e2bcfcc5320 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_domain.c,v 1.25 2007/01/18 20:00:18 henning Exp $	*/
+/*	$OpenBSD: uipc_domain.c,v 1.26 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $	*/
 
 /*
@@ -88,9 +88,6 @@ domaininit(void)
 #if defined (KEY) || defined (IPSEC) || defined (TCP_SIGNATURE)
 	pfkey_init();
 #endif /* KEY || IPSEC */
-#ifdef IPX
-	ADDDOMAIN(ipx);
-#endif
 #ifdef NETATALK
 	ADDDOMAIN(atalk);
 #endif
diff --git a/sys/net/if.c b/sys/net/if.c
index 9fa1df42524..3c2ab061e81 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.159 2007/05/29 02:21:18 claudio Exp $	*/
+/*	$OpenBSD: if.c,v 1.160 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -546,9 +546,6 @@ do { \
 #ifdef INET6
 	IF_DETACH_QUEUES(ip6intrq);
 #endif
-#ifdef IPX
-	IF_DETACH_QUEUES(ipxintrq);
-#endif
 #ifdef NETATALK
 	IF_DETACH_QUEUES(atintrq1);
 	IF_DETACH_QUEUES(atintrq2);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index b6c9952a9e9..b9da352cf60 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.109 2007/05/29 20:19:37 henning Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.110 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -141,11 +141,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netinet6/nd6.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef NETATALK
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
@@ -174,20 +169,6 @@ ether_ioctl(ifp, arp, cmd, data)
 
 	case SIOCSIFADDR:
 		switch (ifa->ifa_addr->sa_family) {
-#ifdef IPX
-		case AF_IPX:
-		    {
-			struct ipx_addr *ina = &IA_SIPX(ifa)->sipx_addr;
-
-			if (ipx_nullhost(*ina))
-				ina->ipx_host =
-				    *(union ipx_host *)(arp->ac_enaddr);
-			else
-				bcopy(ina->ipx_host.c_host,
-				    arp->ac_enaddr, sizeof(arp->ac_enaddr));
-			break;
-		    }
-#endif /* IPX */
 #ifdef NETATALK
 		case AF_APPLETALK:
 			/* Nothing to do. */
@@ -294,16 +275,6 @@ ether_output(ifp0, m0, dst, rt0)
 		etype = htons(ETHERTYPE_IPV6);
 		break;
 #endif
-#ifdef IPX
-	case AF_IPX:
-		etype = htons(ETHERTYPE_IPX);
-		bcopy((caddr_t)&satosipx(dst)->sipx_addr.ipx_host,
-		    (caddr_t)edst, sizeof(edst));
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		break;
-#endif
 #ifdef NETATALK
 	case AF_APPLETALK: {
 		struct at_ifaddr *aa;
@@ -661,12 +632,6 @@ decapsulate:
 		inq = &ip6intrq;
 		break;
 #endif /* INET6 */
-#ifdef IPX
-	case ETHERTYPE_IPX:
-		schednetisr(NETISR_IPX);
-		inq = &ipxintrq;
-		break;
-#endif
 #ifdef NETATALK
 	case ETHERTYPE_AT:
 		schednetisr(NETISR_ATALK);
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 8b22ec2e204..3985573457e 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.51 2007/05/29 20:31:38 henning Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.52 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -101,11 +101,6 @@
 #include <netinet/if_ether.h>
 #include <net/if_fddi.h>
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef INET6
 #ifndef INET
 #include <netinet/in.h>
@@ -240,16 +235,6 @@ fddi_output(ifp0, m0, dst, rt0)
 		break;
 #endif /* INET6 */
 #endif
-#ifdef IPX
-	case AF_IPX:
-		type = htons(ETHERTYPE_IPX);
- 		bcopy((caddr_t)&(((struct sockaddr_ipx*)dst)->sipx_addr.ipx_host),
-		    (caddr_t)edst, sizeof (edst));
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		break;
-#endif
 
 	case pseudo_AF_HDRCMPLT:
 	{
@@ -412,7 +397,7 @@ fddi_input(ifp, fh, m)
 
 	l = mtod(m, struct llc *);
 	switch (l->llc_dsap) {
-#if defined(INET) || defined(IPX) || defined(INET6)
+#if defined(INET) || defined(INET6)
 	case LLC_SNAP_LSAP:
 	{
 		u_int16_t etype;
@@ -450,12 +435,6 @@ fddi_input(ifp, fh, m)
 			inq = &ip6intrq;
 			break;
 #endif /* INET6 */
-#ifdef IPX
-		case ETHERTYPE_IPX:
-			schednetisr(NETISR_IPX);
-			inq = &ipxintrq;
-			break;
-#endif
 		default:
 			/* printf("fddi_input: unknown protocol 0x%x\n", etype); */
 			ifp->if_noproto++;
@@ -463,7 +442,7 @@ fddi_input(ifp, fh, m)
 		}
 		break;
 	}
-#endif /* INET || IPX || INET6 */
+#endif /* INET || INET6 */
 		
 	default:
 		/* printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 84cf8471e84..3485bc75b2d 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.40 2006/03/25 22:41:47 djm Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.41 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -138,11 +138,6 @@
 #include <netinet/ip6.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef NETATALK
 #include <netinet/if_ether.h>
 #include <netatalk/at.h>
@@ -299,12 +294,6 @@ looutput(ifp, m, dst, rt)
 		isr = NETISR_IPV6;
 		break;
 #endif /* INET6 */
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
 #ifdef NETATALK
 	case AF_APPLETALK:
 		ifq = &atintrq2;
@@ -367,12 +356,6 @@ lo_altqstart(ifp)
 			isr = NETISR_IPV6;
 			break;
 #endif
-#ifdef IPX
-		case AF_IPX:
-			ifq = &ipxintrq;
-			isr = NETISR_IPX;
-			break;
-#endif
 #ifdef NETATALK
 		case AF_APPLETALK:
 			ifq = &atintrq2;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 0eb6f1020bb..f434fbb5c79 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.51 2007/05/28 06:31:01 mcbride Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.52 2007/06/06 10:04:36 henning Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -82,11 +82,6 @@
 # error Huh? sppp without INET?
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #include <net/if_sppp.h>
 
 #if defined (__FreeBSD__)
@@ -542,15 +537,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 			}
 			break;
 #endif
-#ifdef IPX
-		case PPP_IPX:
-			/* IPX IPXCP not implemented yet */
-			if (sp->pp_phase == PHASE_NETWORK) {
-				schednetisr (NETISR_IPX);
-				inq = &ipxintrq;
-			}
-			break;
-#endif
 		}
 		break;
 	case CISCO_MULTICAST:
@@ -579,12 +565,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 			inq = &ipintrq;
 			break;
 #endif
-#ifdef IPX
-		case ETHERTYPE_IPX:
-			schednetisr (NETISR_IPX);
-			inq = &ipxintrq;
-			break;
-#endif
 		}
 		break;
 	default:        /* Invalid PPP packet. */
@@ -752,12 +732,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 		}
 		break;
 #endif
-#ifdef IPX
-	case AF_IPX:     /* Novell IPX Protocol */
-		protocol = htons ((sp->pp_flags & PP_CISCO) ?
-			ETHERTYPE_IPX : PPP_IPX);
-		break;
-#endif
 	default:
 		m_freem(m);
 		++ifp->if_oerrors;
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index c262e366bb3..b37393e14d5 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.88 2007/05/26 17:13:31 jason Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.89 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -71,11 +71,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef NETATALK
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
@@ -885,12 +880,6 @@ tunwrite(dev_t dev, struct uio *uio, int ioflag)
 		isr = NETISR_IPV6;
 		break;
 #endif
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
 #ifdef NETATALK
 	case AF_APPLETALK:
 		ifq = &atintrq2;
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 530e419155c..a57758a653d 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netisr.h,v 1.26 2007/05/29 18:10:43 miod Exp $	*/
+/*	$OpenBSD: netisr.h,v 1.27 2007/06/06 10:04:36 henning Exp $	*/
 /*	$NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 #define	NETISR_IP	2		/* same as AF_INET */
 #define	NETISR_ATALK	16		/* same as AF_APPLETALK */
 #define	NETISR_ARP	18		/* same as AF_LINK */
-#define	NETISR_IPX	23		/* same as AF_IPX */
 #define	NETISR_IPV6	24		/* same as AF_INET6 */
 #define	NETISR_ISDN	26		/* same as AF_E164 */
 #define	NETISR_NATM	27		/* same as AF_ATM */
@@ -74,7 +73,6 @@ void	arpintr(void);
 void	ipintr(void);
 void	ip6intr(void);
 void	atintr(void);
-void	ipxintr(void);
 void	clnlintr(void);
 void	natmintr(void);
 void	pppintr(void);
diff --git a/sys/net/netisr_dispatch.h b/sys/net/netisr_dispatch.h
index 44ac48c395d..3269806eaac 100644
--- a/sys/net/netisr_dispatch.h
+++ b/sys/net/netisr_dispatch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netisr_dispatch.h,v 1.12 2007/05/29 05:43:22 claudio Exp $	*/
+/*	$OpenBSD: netisr_dispatch.h,v 1.13 2007/06/06 10:04:36 henning Exp $	*/
 /* $NetBSD: netisr_dispatch.h,v 1.2 2000/07/02 04:40:47 cgd Exp $ */
 
 /*
@@ -48,9 +48,6 @@
 #ifdef NETATALK
 	DONETISR(NETISR_ATALK,atintr);
 #endif
-#ifdef IPX
-	DONETISR(NETISR_IPX,ipxintr);
-#endif
 #if NATM > 0
 	DONETISR(NETISR_NATM,natmintr);
 #endif