commit eb7803542d961bbacc7a13abd21be8d64a365ea2
Author: Ryota Ozaki <ozaki-r@iij.ad.jp>
Date:   Fri May 22 15:11:11 2015 +0900

    Remove leftover IPX-related stuffs

diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c
index 080c434..cc85be6 100644
--- a/sys/dev/pcmcia/if_xi.c
+++ b/sys/dev/pcmcia/if_xi.c
@@ -58,7 +58,6 @@
 __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $");
 
 #include "opt_inet.h"
-#include "opt_ipx.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -84,12 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $");
 #include <netinet/if_inarp.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 70c678f..ee306c8 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r E
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
-#include "opt_ipx.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_gateway.h"
@@ -153,11 +152,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r E
 #include <netinet/ip_carp.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>
@@ -370,17 +364,6 @@ ether_output(struct ifnet * const ifp0, struct mbuf * const m0,
 		}
 		break;
 #endif /* NETATALK */
-#ifdef IPX
-	case AF_IPX:
-		etype = htons(ETHERTYPE_IPX);
- 		memcpy(edst,
-		    &(((const struct sockaddr_ipx *)dst)->sipx_addr.x_host),
-		    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:
 		hdrcmplt = 1;
 		memcpy(esrc,
@@ -856,12 +839,6 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
 			pktq = ip6_pktq;
 			break;
 #endif
-#ifdef IPX
-		case ETHERTYPE_IPX:
-			isr = NETISR_IPX;
-			inq = &ipxintrq;
-			break;
-#endif
 #ifdef NETATALK
 		case ETHERTYPE_ATALK:
 			isr = NETISR_ATALK;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index e30a010..ad83099 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -101,7 +101,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp
 #include "opt_gateway.h"
 #include "opt_inet.h"
 #include "opt_atalk.h"
-#include "opt_ipx.h"
 #include "opt_mbuftrace.h"
 
 
@@ -135,11 +134,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp
 #endif
 #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>
@@ -316,16 +310,6 @@ fddi_output(struct ifnet *ifp0, struct mbuf *m0, const struct sockaddr *dst,
 		break;
 	}
 #endif /* AF_ARP */
-#ifdef IPX
-	case AF_IPX:
-		etype = htons(ETHERTYPE_IPX);
- 		memcpy(edst, &(((struct sockaddr_ipx *)dst)->sipx_addr.x_host),
-		    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;
@@ -462,7 +446,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 #if defined(INET) || defined(INET6)
 	pktqueue_t *pktq = NULL;
 #endif
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
 	struct ifqueue *inq = NULL;
 	int isr = 0;
 	int s;
@@ -506,7 +490,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 
 	l = (struct llc *)(fh+1);
 	switch (l->llc_dsap) {
-#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK)
 	case LLC_SNAP_LSAP:
 	{
 		uint16_t etype;
@@ -557,7 +541,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 
 		case ETHERTYPE_ARP:
 #if !defined(__bsdi__) || _BSDI_VERSION >= 199401
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
 			isr = NETISR_ARP;
 			inq = &arpintrq;
 #endif
@@ -567,12 +551,6 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 			return;
 #endif
 #endif
-#ifdef IPX
-		case ETHERTYPE_IPX:
-			isr = NETISR_IPX;
-			inq = &ipxintrq;
-			break;
-#endif
 #ifdef INET6
 		case ETHERTYPE_IPV6:
 #ifdef GATEWAY  
@@ -609,7 +587,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 
 	default:
 		ifp->if_noproto++;
-#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK)
 	dropanyway:
 #endif
 		m_freem(m);
@@ -624,7 +602,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 		return;
 	}
 #endif
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
 	if (!inq) {
 		m_freem(m);
 	}
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a715890..6c6aabb 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -69,7 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.81 2015/04/03 07:55:18 ozaki-r Exp $")
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
-#include "opt_ipx.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_net_mpsafe.h"
@@ -107,11 +106,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.81 2015/04/03 07:55:18 ozaki-r Exp $")
 #include <netinet/ip6.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef MPLS
 #include <netmpls/mpls.h>
 #include <netmpls/mpls_var.h>
@@ -308,12 +302,6 @@ looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		pktq = ip6_pktq;
 		break;
 #endif
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
 #ifdef NETATALK
 	case AF_APPLETALK:
 	        ifq = &atintrq2;
@@ -386,12 +374,6 @@ lostart(struct ifnet *ifp)
 			pktq = ip6_pktq;
 			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 915fbf7..b5bbc11 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.133 2015/05/02 14:41:32 roy Exp $"
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
-#include "opt_ipx.h"
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #endif
@@ -85,11 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.133 2015/05/02 14:41:32 roy Exp $"
 #include <netinet6/scope6_var.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #include <net/if_sppp.h>
 #include <net/if_spppvar.h>
 
@@ -548,12 +542,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 				pktq = ip6_pktq;
 				break;
 #endif
-#ifdef IPX
-			case ETHERTYPE_IPX:
-				isr = NETISR_IPX;
-				inq = &ipxintrq;
-				break;
-#endif
 			}
 			goto queue_pkt;
 		default:        /* Invalid PPP packet. */
@@ -624,15 +612,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 == SPPP_PHASE_NETWORK) {
-			isr = NETISR_IPX;
-			inq = &ipxintrq;
-		}
-		break;
-#endif
 	}
 
 queue_pkt:
@@ -829,12 +808,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/netisr.h b/sys/net/netisr.h
index 1f41106..403ee9a 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -104,7 +104,6 @@
 #define	NETISR_IP	2		/* same as AF_INET */
 #define	NETISR_CCITT	10		/* same as AF_CCITT */
 #define	NETISR_ATALK	16		/* same as AF_APPLETALK */
-#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_NATM */
diff --git a/sys/netsmb/netbios.h b/sys/netsmb/netbios.h
index ec9f9d6..c511e8e 100644
--- a/sys/netsmb/netbios.h
+++ b/sys/netsmb/netbios.h
@@ -43,12 +43,6 @@
 #include <netinet/in.h>
 #endif
 
-#ifndef NetBSD
-#ifndef _NETIPX_IPX_H_
-#include <netipx/ipx.h>
-#endif
-#endif
-
 #define AF_NETBIOS	AF_NS		/* XXX: should go to socket.h */
 #define PF_NETBIOS	AF_NETBIOS
 
diff --git a/sys/rump/net/lib/libnet/opt/opt_ipx.h b/sys/rump/net/lib/libnet/opt/opt_ipx.h
deleted file mode 100644
index f594b70..0000000
--- a/sys/rump/net/lib/libnet/opt/opt_ipx.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: opt_ipx.h,v 1.1 2008/10/06 00:27:06 pooka Exp $	*/
-
-/* dummy */