diff options
author | eivind <eivind@FreeBSD.org> | 1997-12-15 20:31:25 +0000 |
---|---|---|
committer | eivind <eivind@FreeBSD.org> | 1997-12-15 20:31:25 +0000 |
commit | 3452c23db8bec7afb3a4bc3b82801c3d659e2e55 (patch) | |
tree | b28bf5a6d5fe5f4fac13c8f346dd64244f8ed330 /sys | |
parent | bf82710fe709ef5b3e943e0ec201b4ef5add73fa (diff) | |
download | FreeBSD-src-3452c23db8bec7afb3a4bc3b82801c3d659e2e55.zip FreeBSD-src-3452c23db8bec7afb3a4bc3b82801c3d659e2e55.tar.gz |
Throw options IPX, IPXIP and IPTUNNEL into opt_ipx.h.
The #ifdef IPXIP in netipx/ipx_if.h is OK (used from ipx_usrreq.c and
ifconfig.c only).
I also fixed a typo IPXTUNNEL -> IPTUNNEL (and #ifdef'ed out the code
inside, as it never could have compiled - doh.)
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/options | 5 | ||||
-rw-r--r-- | sys/dev/de/if_de.c | 4 | ||||
-rw-r--r-- | sys/dev/ep/if_ep.c | 3 | ||||
-rw-r--r-- | sys/dev/ex/if_ex.c | 3 | ||||
-rw-r--r-- | sys/dev/fe/if_fe.c | 3 | ||||
-rw-r--r-- | sys/dev/ie/if_ie.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_el.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ep.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ex.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_fe.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ie.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_le.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_ze.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_zp.c | 3 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 4 | ||||
-rw-r--r-- | sys/net/if_fddisubr.c | 4 | ||||
-rw-r--r-- | sys/net/if_loop.c | 4 | ||||
-rw-r--r-- | sys/net/if_ppp.c | 3 | ||||
-rw-r--r-- | sys/net/if_spppsubr.c | 4 | ||||
-rw-r--r-- | sys/netinet/in_proto.c | 3 | ||||
-rw-r--r-- | sys/netipx/ipx_ip.c | 4 | ||||
-rw-r--r-- | sys/netipx/ipx_proto.c | 4 | ||||
-rw-r--r-- | sys/netipx/ipx_usrreq.c | 10 | ||||
-rw-r--r-- | sys/pc98/pc98/if_fe.c | 4 | ||||
-rw-r--r-- | sys/pci/if_de.c | 4 |
25 files changed, 66 insertions, 27 deletions
diff --git a/sys/conf/options b/sys/conf/options index 89f1552..4d11d16 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.37 1997/11/05 20:17:06 joerg Exp $ +# $Id: options,v 1.38 1997/11/13 00:28:49 julian Exp $ # Format: # Option name filename @@ -102,6 +102,9 @@ IPFIREWALL opt_ipfw.h IPFIREWALL_VERBOSE opt_ipfw.h IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h +IPX opt_ipx.h +IPXIP opt_ipx.h +IPTUNNEL opt_ipx.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 2ca1d64..f94d42f 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */ -/* $Id: if_de.c,v 1.74 1997/11/08 14:46:53 peter Exp $ */ +/* $Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -39,6 +39,8 @@ */ #define TULIP_HDR_DATA +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index b029679..5c55256 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.67 1997/11/20 15:48:32 nate Exp $ + * $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -60,6 +60,7 @@ #if NEP > 0 #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #if defined(__FreeBSD__) diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index 6599e60..78500eb 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $ + * $Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $ */ /* @@ -38,6 +38,7 @@ #include "ex.h" #if NEX > 0 #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index 866f505..115b85e 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.34 1997/11/07 08:52:39 phk Exp $ + * $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -72,6 +72,7 @@ #include "fe.h" #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index d60ce4c..daab501 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.46 1997/09/21 21:41:08 gibbs Exp $ + * $Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $ */ /* @@ -108,6 +108,7 @@ iomem and and with 0xffff. #include "ie.h" #if NIE > 0 +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index 7001c07..9fb5a17 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.30 1997/03/24 11:32:43 bde Exp $ + * $Id: if_el.c,v 1.31 1997/07/20 14:09:57 bde Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -21,6 +21,7 @@ */ #include "el.h" #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index b029679..5c55256 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.67 1997/11/20 15:48:32 nate Exp $ + * $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -60,6 +60,7 @@ #if NEP > 0 #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #if defined(__FreeBSD__) diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c index 6599e60..78500eb 100644 --- a/sys/i386/isa/if_ex.c +++ b/sys/i386/isa/if_ex.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $ + * $Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $ */ /* @@ -38,6 +38,7 @@ #include "ex.h" #if NEX > 0 #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c index 866f505..115b85e 100644 --- a/sys/i386/isa/if_fe.c +++ b/sys/i386/isa/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.34 1997/11/07 08:52:39 phk Exp $ + * $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -72,6 +72,7 @@ #include "fe.h" #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index d60ce4c..daab501 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.46 1997/09/21 21:41:08 gibbs Exp $ + * $Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $ */ /* @@ -108,6 +108,7 @@ iomem and and with 0xffff. #include "ie.h" #if NIE > 0 +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 60df6b2..4bbfc7e 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_le.c,v 1.40 1997/08/21 09:01:00 fsmp Exp $ + * $Id: if_le.c,v 1.41 1997/08/25 22:28:57 bde Exp $ */ /* @@ -37,6 +37,7 @@ #include "le.h" #if NLE > 0 +#include "opt_ipx.h" #include <sys/param.h> #include <sys/conf.h> diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index 94349bb..961dfeb 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.45 1997/07/20 23:07:39 fsmp Exp $ + * $Id: if_ze.c,v 1.46 1997/10/26 04:36:14 nate Exp $ */ /* XXX - Don't mix different PCCARD support code */ @@ -64,6 +64,7 @@ #include "ze.h" #if NZE > 0 #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index 18bf360..b9e2933 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.40 1997/10/26 04:36:14 nate Exp $ + * $Id: if_zp.c,v 1.41 1997/11/07 09:20:28 phk Exp $ */ /*- * TODO: @@ -114,6 +114,7 @@ #include "zp.h" #include "bpfilter.h" +#include "opt_ipx.h" #include <sys/param.h> #if defined(__FreeBSD__) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 7d90fab..444b8c2 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ethersubr.c,v 1.38 1997/10/29 00:30:43 julian Exp $ + * $Id: if_ethersubr.c,v 1.39 1997/11/07 08:53:18 phk Exp $ */ +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 060409f..a5e3809 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -33,9 +33,11 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $Id: if_fddisubr.c,v 1.21 1997/10/29 07:59:27 julian Exp $ + * $Id: if_fddisubr.c,v 1.22 1997/11/18 13:37:56 bde Exp $ */ +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 8aafc51..524b443 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_loop.c,v 1.26 1997/03/24 11:33:12 bde Exp $ + * $Id: if_loop.c,v 1.27 1997/08/02 14:32:37 bde Exp $ */ /* @@ -40,6 +40,8 @@ #include "loop.h" #if NLOOP > 0 +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 99d399f..0af8caa 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.50 1997/11/18 13:52:41 bde Exp $ */ +/* $Id: if_ppp.c,v 1.51 1997/12/06 13:24:25 bde Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -77,6 +77,7 @@ #if NPPP > 0 #include "opt_ppp.h" +#include "opt_ipx.h" #define VJC #define PPP_COMPRESS diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 29597d2..be5d4a5 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -17,9 +17,11 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $Id: if_spppsubr.c,v 1.26 1997/09/02 01:18:37 bde Exp $ + * $Id: if_spppsubr.c,v 1.28 1997/10/11 11:25:28 joerg Exp $ */ +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index a96fa67..b153ca7 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -31,10 +31,11 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $Id: in_proto.c,v 1.43 1997/10/28 15:58:43 bde Exp $ + * $Id: in_proto.c,v 1.44 1997/11/05 20:17:16 joerg Exp $ */ #include "opt_ipdivert.h" +#include "opt_ipx.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index d023a02..bd9eb51 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -33,13 +33,15 @@ * * @(#)ipx_ip.c * - * $Id: ipx_ip.c,v 1.15 1997/05/10 09:58:52 jhay Exp $ + * $Id: ipx_ip.c,v 1.16 1997/06/26 19:35:47 jhay Exp $ */ /* * Software interface driver for encapsulating IPX in IP. */ +#include "opt_ipx.h" + #ifdef IPXIP #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c index 2b87647..ce20687 100644 --- a/sys/netipx/ipx_proto.c +++ b/sys/netipx/ipx_proto.c @@ -33,9 +33,11 @@ * * @(#)ipx_proto.c * - * $Id: ipx_proto.c,v 1.10 1997/05/10 09:58:54 jhay Exp $ + * $Id: ipx_proto.c,v 1.11 1997/06/26 19:35:55 jhay Exp $ */ +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/socket.h> #include <sys/protosw.h> diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 44eb0db..e65548a 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -33,9 +33,11 @@ * * @(#)ipx_usrreq.c * - * $Id: ipx_usrreq.c,v 1.16 1997/08/16 19:15:45 wollman Exp $ + * $Id: ipx_usrreq.c,v 1.17 1997/09/14 03:10:41 peter Exp $ */ +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -407,11 +409,13 @@ ipx_ctloutput(req, so, level, name, value, p) error = ipxip_route(so, *value, p); break; #endif /* IPXIP */ -#ifdef IPXTUNNEL - case SO_IPXTUNNEL_ROUTE +#ifdef IPTUNNEL +#if 0 + case SO_IPXTUNNEL_ROUTE: error = ipxtun_route(so, *value, p); break; #endif +#endif default: error = EINVAL; } diff --git a/sys/pc98/pc98/if_fe.c b/sys/pc98/pc98/if_fe.c index fe376cc..b6e8ce4 100644 --- a/sys/pc98/pc98/if_fe.c +++ b/sys/pc98/pc98/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.26 1997/11/07 12:53:59 kato Exp $ + * $Id: if_fe.c,v 1.27 1997/11/25 09:42:25 kato Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -75,6 +75,8 @@ * o To test IPX codes. */ +#include "opt_ipx.h" + #include "fe.h" #include "bpfilter.h" diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 2ca1d64..f94d42f 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */ -/* $Id: if_de.c,v 1.74 1997/11/08 14:46:53 peter Exp $ */ +/* $Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -39,6 +39,8 @@ */ #define TULIP_HDR_DATA +#include "opt_ipx.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> |