[src/trunk]: src/sys defopt the XNS protocol (options NS), clean up the use o...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31fc1bc3af69
branches:  trunk
changeset: 477635:31fc1bc3af69
user:      drochner <drochner%NetBSD.org@localhost>
date:      Mon Oct 25 19:18:10 1999 +0000

description:
defopt the XNS protocol (options NS), clean up the use of related
option headers / defines

diffstat:

 sys/conf/files                  |   7 ++++---
 sys/dev/cardbus/if_ex_cardbus.c |  19 +------------------
 sys/net/if_gre.c                |   3 ++-
 sys/netinet/ip_gre.c            |   4 +++-
 sys/netns/ns.c                  |   7 +------
 sys/netns/ns_ip.c               |   6 ++----
 6 files changed, 13 insertions(+), 33 deletions(-)

diffs (153 lines):

diff -r d76da0954310 -r 31fc1bc3af69 sys/conf/files
--- a/sys/conf/files    Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/conf/files    Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.324 1999/10/15 06:09:29 haya Exp $
+#      $NetBSD: files,v 1.325 1999/10/25 19:18:10 drochner Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -50,7 +50,8 @@
 defopt opt_ipsec.h     IPSEC IPSEC_ESP
 defopt opt_inet_conf.h SUBNETSARELOCAL HOSTZEROBROADCAST
 defopt opt_atalk.h     NETATALK
-defopt opt_ns.h        NSIP            # XNS tunneled over IP
+defopt opt_ns.h        NS NSIP         # NS network stack,
+                                       # XNS tunneled over IP
 defopt opt_iso.h       ISO TPIP        # ISO network stack
 defopt  IPX                            # IPX network stack
 defopt EON                             # ISO clnp over IP
@@ -839,7 +840,7 @@
 file netns/ns.c                                ns
 file netns/ns_error.c                  ns
 file netns/ns_input.c                  ns
-file netns/ns_ip.c                     ns
+file netns/ns_ip.c                     ns & nsip
 file netns/ns_output.c                 ns
 file netns/ns_pcb.c                    ns
 file netns/ns_proto.c                  ns
diff -r d76da0954310 -r 31fc1bc3af69 sys/dev/cardbus/if_ex_cardbus.c
--- a/sys/dev/cardbus/if_ex_cardbus.c   Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/dev/cardbus/if_ex_cardbus.c   Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ex_cardbus.c,v 1.3 1999/10/15 10:59:57 augustss Exp $       */
+/*     $NetBSD: if_ex_cardbus.c,v 1.4 1999/10/25 19:18:10 drochner Exp $       */
 
 /*
  * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@@ -66,23 +66,6 @@
 #include <net/netisr.h>
 #include <net/if_ether.h>
 
-#if defined INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-#endif
-
 #include <machine/cpu.h>
 #include <machine/pio.h>
 #include <machine/bus.h>
diff -r d76da0954310 -r 31fc1bc3af69 sys/net/if_gre.c
--- a/sys/net/if_gre.c  Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/net/if_gre.c  Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gre.c,v 1.8 1999/06/28 07:52:38 explorer Exp $ */
+/*     $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
 #if NGRE > 0
 
 #include "opt_inet.h"
+#include "opt_ns.h"
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff -r d76da0954310 -r 31fc1bc3af69 sys/netinet/ip_gre.c
--- a/sys/netinet/ip_gre.c      Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/netinet/ip_gre.c      Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_gre.c,v 1.8 1999/01/19 23:03:21 mycroft Exp $ */
+/*     $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -47,6 +47,8 @@
 #if NGRE > 0
 
 #include "opt_inet.h"
+#include "opt_ns.h"
+#include "opt_atalk.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d76da0954310 -r 31fc1bc3af69 sys/netns/ns.c
--- a/sys/netns/ns.c    Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/netns/ns.c    Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns.c,v 1.16 1998/09/13 15:21:32 christos Exp $ */
+/*     $NetBSD: ns.c,v 1.17 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
  * Copyright (c) 1984, 1985, 1986, 1987, 1993
@@ -35,8 +35,6 @@
  *     @(#)ns.c        8.5 (Berkeley) 2/9/95
  */
 
-#include "opt_ns.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -54,8 +52,6 @@
 #include <netns/ns_if.h>
 #include <netns/ns_var.h>
 
-#ifdef NS
-
 struct ns_ifaddrhead ns_ifaddr;
 int ns_interfaces;
 extern struct sockaddr_ns ns_netmask, ns_hostmask;
@@ -340,4 +336,3 @@
        }
        return (ia_maybe);
 }
-#endif
diff -r d76da0954310 -r 31fc1bc3af69 sys/netns/ns_ip.c
--- a/sys/netns/ns_ip.c Mon Oct 25 19:08:26 1999 +0000
+++ b/sys/netns/ns_ip.c Mon Oct 25 19:18:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_ip.c,v 1.22 1998/07/05 06:49:18 jonathan Exp $      */
+/*     $NetBSD: ns_ip.c,v 1.23 1999/10/25 19:18:11 drochner Exp $      */
 
 /*
  * Copyright (c) 1984, 1985, 1986, 1987, 1993
@@ -39,9 +39,8 @@
  * Software interface driver for encapsulating ns in ip.
  */
 
-#include "opt_ns.h"                    /* options NSIP */
+#include "opt_ns.h"            /* options NSIP, needed by ns_if.h */
 
-#ifdef NSIP
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -478,4 +477,3 @@
                }
        }
 }
-#endif