From a7246ed45b4e70820cc609b9abd0dc340fd24782 Mon Sep 17 00:00:00 2001
From: tjr <tjr@FreeBSD.org>
Date: Sat, 8 Mar 2003 06:58:22 +0000
Subject: Remove unimplemented IP-in-IPX encapsulation support (options
 IPTUNNEL).

---
 sys/netipx/ipx_proto.c  | 10 ----------
 sys/netipx/ipx_tun.c    | 42 ------------------------------------------
 sys/netipx/ipx_usrreq.c |  7 -------
 3 files changed, 59 deletions(-)
 delete mode 100644 sys/netipx/ipx_tun.c

(limited to 'sys/netipx')

diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index 36e2b53..f5379d1 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -90,16 +90,6 @@ static struct protosw ipxsw[] = {
   0,		0,		0,		0,
   &ripx_usrreqs
 },
-#ifdef IPTUNNEL
-#if 0
-{ SOCK_RAW,	&ipxdomain,	IPPROTO_IPX,	PR_ATOMIC|PR_ADDR,
-  iptun_input,	rip_output,	iptun_ctlinput,	0,
-  0,
-  0,		0,		0,		0,
-  &rip_usrreqs
-},
-#endif
-#endif
 };
 
 static struct	domain ipxdomain =
diff --git a/sys/netipx/ipx_tun.c b/sys/netipx/ipx_tun.c
deleted file mode 100644
index f2709eb..0000000
--- a/sys/netipx/ipx_tun.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Modifications Copyright (c) 1995, Mike Mitchell
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ipx_tun.c
- *
- * $FreeBSD$
- */
-
-/*
- * Software interface driver for encapsulating IP in IPX.
- * XXX not implemented.
- */
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index f0c803a..019470b 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -404,13 +404,6 @@ ipx_ctloutput(so, sopt)
 			error = ipxip_route(so, sopt);
 			break;
 #endif /* IPXIP */
-#ifdef IPTUNNEL
-#if 0
-		case SO_IPXTUNNEL_ROUTE:
-			error = ipxtun_route(so, sopt);
-			break;
-#endif
-#endif
 		default:
 			error = EINVAL;
 		}
-- 
cgit v1.1