summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-06-13 14:01:43 +0000
committerrwatson <rwatson@FreeBSD.org>2007-06-13 14:01:43 +0000
commit20ee7c7a9b5f1194697b9fc673b37c2575903f60 (patch)
tree03ce39cd0fe983310ac1654308f24eff87c19b0b /sys/conf
parent7d990e0773e95c056a21a8c2ee853fb2a51595d4 (diff)
downloadFreeBSD-src-20ee7c7a9b5f1194697b9fc673b37c2575903f60.zip
FreeBSD-src-20ee7c7a9b5f1194697b9fc673b37c2575903f60.tar.gz
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)
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/options1
3 files changed, 0 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 59a0cc8..94a7f37 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -516,7 +516,6 @@ options IPSEC_DEBUG #debug for IP security
#options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
options IPX #IPX/SPX communications protocols
-options IPXIP #IPX in IP encapsulation (not available)
options NCP #NetWare Core protocol
diff --git a/sys/conf/files b/sys/conf/files
index 9db5573..d92b22a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1908,7 +1908,6 @@ netipsec/xform_tcp.c optional fast_ipsec tcp_signature
netipx/ipx.c optional ipx
netipx/ipx_cksum.c optional ipx
netipx/ipx_input.c optional ipx
-netipx/ipx_ip.c optional ipx ipxip
netipx/ipx_outputfl.c optional ipx
netipx/ipx_pcb.c optional ipx
netipx/ipx_proto.c optional ipx
diff --git a/sys/conf/options b/sys/conf/options
index c5a524d..12d5f2f 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -376,7 +376,6 @@ IPFIREWALL_FORWARD opt_ipfw.h
IPFIREWALL_NAT opt_ipfw.h
IPSTEALTH
IPX
-IPXIP opt_ipx.h
LIBMBPOOL
LIBMCHAIN
LIBALIAS
OpenPOWER on IntegriCloud