[src/trunk]: src/sys defopt INET6, and put it in opt_inet.h (most places alre...

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

details:   https://anonhg.NetBSD.org/src/rev/1bc378052ef5
branches:  trunk
changeset: 474526:1bc378052ef5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 09 23:41:16 1999 +0000

description:
defopt INET6, and put it in opt_inet.h (most places already include this
file, which is why the file list is so short).

diffstat:

 sys/conf/files          |  4 ++--
 sys/net/if.c            |  4 +++-
 sys/net/if_faith.c      |  2 +-
 sys/net/if_gif.h        |  4 ++++
 sys/net/rtsock.c        |  4 +++-
 sys/netinet/ip_ecn.h    |  6 +++++-
 sys/netinet/tcp_debug.h |  6 +++++-
 sys/netinet/tcp_var.h   |  6 +++++-
 sys/netinet6/ah.h       |  6 +++++-
 sys/netinet6/esp.h      |  6 +++++-
 sys/netinet6/ipcomp.h   |  6 +++++-
 sys/netinet6/ipsec.h    |  6 +++++-
 sys/netkey/key_var.h    |  6 +++++-
 13 files changed, 53 insertions(+), 13 deletions(-)

diffs (240 lines):

diff -r a9a955e32682 -r 1bc378052ef5 sys/conf/files
--- a/sys/conf/files    Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/conf/files    Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.301 1999/07/09 22:57:15 thorpej Exp $
+#      $NetBSD: files,v 1.302 1999/07/09 23:41:16 thorpej Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -50,7 +50,7 @@
                                COMPAT_13 COMPAT_NOMID
 
 # networking protocols
-defopt INET
+defopt opt_inet.h      INET INET6
 defopt opt_ipsec.h     IPSEC IPSEC_ESP
 defopt opt_inet_conf.h SUBNETSARELOCAL HOSTZEROBROADCAST
 defopt opt_atalk.h     NETATALK
diff -r a9a955e32682 -r 1bc378052ef5 sys/net/if.c
--- a/sys/net/if.c      Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/net/if.c      Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.49 1999/07/01 08:12:47 itojun Exp $   */
+/*     $NetBSD: if.c,v 1.50 1999/07/09 23:41:16 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -64,6 +64,8 @@
  *     @(#)if.c        8.5 (Berkeley) 1/9/95
  */
 
+#include "opt_inet.h"
+
 #include "opt_compat_linux.h"
 #include "opt_compat_svr4.h"
 #include "opt_compat_43.h"
diff -r a9a955e32682 -r 1bc378052ef5 sys/net/if_faith.c
--- a/sys/net/if_faith.c        Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/net/if_faith.c        Fri Jul 09 23:41:16 1999 +0000
@@ -39,7 +39,7 @@
 /*
  * Loopback interface driver for protocol testing and timing.
  */
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include "opt_inet.h"
 #endif
 
diff -r a9a955e32682 -r 1bc378052ef5 sys/net/if_gif.h
--- a/sys/net/if_gif.h  Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/net/if_gif.h  Fri Jul 09 23:41:16 1999 +0000
@@ -34,6 +34,10 @@
 #ifndef _NET_IF_GIF_H_
 #define _NET_IF_GIF_H_
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_inet.h"
+#endif
+
 #include <netinet/in.h>
 /* xxx sigh, why route have struct route instead of pointer? */
 
diff -r a9a955e32682 -r 1bc378052ef5 sys/net/rtsock.c
--- a/sys/net/rtsock.c  Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/net/rtsock.c  Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock.c,v 1.30 1999/07/01 08:12:49 itojun Exp $       */
+/*     $NetBSD: rtsock.c,v 1.31 1999/07/09 23:41:16 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -64,6 +64,8 @@
  *     @(#)rtsock.c    8.7 (Berkeley) 10/12/95
  */
 
+#include "opt_inet.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet/ip_ecn.h
--- a/sys/netinet/ip_ecn.h      Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet/ip_ecn.h      Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_ecn.h,v 1.4 1999/07/06 12:23:20 itojun Exp $        */
+/*     $NetBSD: ip_ecn.h,v 1.5 1999/07/09 23:41:17 thorpej Exp $       */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -35,6 +35,10 @@
  * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
  */
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 #define ECN_ALLOWED    1       /* ECN allowed */
 #define ECN_FORBIDDEN  0       /* ECN forbidden */
 #define ECN_NOCARE     (-1)    /* no consideration to ECN */
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet/tcp_debug.h
--- a/sys/netinet/tcp_debug.h   Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet/tcp_debug.h   Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_debug.h,v 1.7 1999/07/01 08:12:51 itojun Exp $     */
+/*     $NetBSD: tcp_debug.h,v 1.8 1999/07/09 23:41:17 thorpej Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -38,6 +38,10 @@
 #ifndef _NETINET_TCP_DEBUG_H_
 #define _NETINET_TCP_DEBUG_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 struct tcp_debug {
        n_time  td_time;
        short   td_act;
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h     Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet/tcp_var.h     Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_var.h,v 1.61 1999/07/01 08:12:52 itojun Exp $      */
+/*     $NetBSD: tcp_var.h,v 1.62 1999/07/09 23:41:17 thorpej Exp $     */
 
 /*
 %%% portions-copyright-nrl-98
@@ -117,6 +117,10 @@
 #ifndef _NETINET_TCP_VAR_H_
 #define _NETINET_TCP_VAR_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 /*
  * Kernel variables for tcp.
  */
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet6/ah.h
--- a/sys/netinet6/ah.h Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet6/ah.h Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah.h,v 1.3 1999/07/03 21:30:17 thorpej Exp $   */
+/*     $NetBSD: ah.h,v 1.4 1999/07/09 23:41:17 thorpej Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -36,6 +36,10 @@
 #ifndef _NETINET6_AH_H_
 #define _NETINET6_AH_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 #include <netkey/keydb.h>              /* for struct secas */
 
 struct ah {
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet6/esp.h
--- a/sys/netinet6/esp.h        Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet6/esp.h        Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp.h,v 1.2 1999/07/03 21:30:17 thorpej Exp $  */
+/*     $NetBSD: esp.h,v 1.3 1999/07/09 23:41:17 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -38,6 +38,10 @@
 
 #include <netkey/keydb.h>              /* for struct secas */
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 struct esp {
        u_int32_t       esp_spi;        /* ESP */
        /*variable size, 32bit bound*/  /* Initialization Vector */
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet6/ipcomp.h
--- a/sys/netinet6/ipcomp.h     Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet6/ipcomp.h     Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcomp.h,v 1.3 1999/07/03 21:30:19 thorpej Exp $       */
+/*     $NetBSD: ipcomp.h,v 1.4 1999/07/09 23:41:17 thorpej Exp $       */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -36,6 +36,10 @@
 #ifndef _NETINET6_IPCOMP_H_
 #define _NETINET6_IPCOMP_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
diff -r a9a955e32682 -r 1bc378052ef5 sys/netinet6/ipsec.h
--- a/sys/netinet6/ipsec.h      Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netinet6/ipsec.h      Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.h,v 1.3 1999/07/03 21:30:19 thorpej Exp $        */
+/*     $NetBSD: ipsec.h,v 1.4 1999/07/09 23:41:17 thorpej Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -36,6 +36,10 @@
 #ifndef _NETINET6_IPSEC_H_
 #define _NETINET6_IPSEC_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 #include <netkey/keyv2.h>
 #include <netkey/keydb.h>
 
diff -r a9a955e32682 -r 1bc378052ef5 sys/netkey/key_var.h
--- a/sys/netkey/key_var.h      Fri Jul 09 22:57:15 1999 +0000
+++ b/sys/netkey/key_var.h      Fri Jul 09 23:41:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_var.h,v 1.3 1999/07/03 21:32:48 thorpej Exp $      */
+/*     $NetBSD: key_var.h,v 1.4 1999/07/09 23:41:17 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -32,6 +32,10 @@
 #ifndef _NETKEY_KEY_VAR_H_
 #define _NETKEY_KEY_VAR_H_
 
+#if defined(_KERNEL) && !defined(_LKM)             
+#include "opt_inet.h"
+#endif                                             
+
 /* sysctl */
 #define KEYCTL_DEBUG_LEVEL             1
 #define KEYCTL_SPI_TRY                 2