From 20ee7c7a9b5f1194697b9fc673b37c2575903f60 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Wed, 13 Jun 2007 14:01:43 +0000
Subject: Remove IPX over IP tunneling support, which allows IPX routing over
 IP tunnels, and was not MPSAFE.  The code can be easily restored in the event
 that someone with an IPX over IP tunnel configuration can work with me to
 test patches.

This removes one of five remaining consumers of NET_NEEDS_GIANT.

Approved by:	re (kensmith)
---
 sys/netinet/in_proto.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'sys/netinet/in_proto.c')

diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 28196ef..dbf9690 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -82,10 +82,6 @@ static struct pr_usrreqs nousrreqs;
 #include <netipsec/ipsec.h>
 #endif /* FAST_IPSEC */
 
-#ifdef IPXIP
-#include <netipx/ipx_ip.h>
-#endif
-
 #ifdef SCTP
 #include <netinet/in_pcb.h>
 #include <netinet/sctp_pcb.h>
@@ -331,17 +327,6 @@ struct protosw inetsw[] = {
 	.pr_usrreqs =		&rip_usrreqs
 },
 #endif
-#ifdef IPXIP
-{
-	.pr_type =		SOCK_RAW,
-	.pr_domain =		&inetdomain,
-	.pr_protocol =		IPPROTO_IDP,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		ipxip_input,
-	.pr_ctlinput =		ipxip_ctlinput,
-	.pr_usrreqs =		&rip_usrreqs
-},
-#endif
 {
 	.pr_type =		SOCK_RAW,
 	.pr_domain =		&inetdomain,
-- 
cgit v1.1