Module Name: src
Committed By: pooka
Date: Mon Aug 24 22:21:27 UTC 2015
Modified Files:
src/sys/kern: uipc_mbuf.c uipc_socket.c uipc_socket2.c uipc_syscalls.c
src/sys/net: if_arcsubr.c if_atmsubr.c if_ecosubr.c if_etherip.c
if_ethersubr.c if_fddisubr.c if_gif.c if_gre.c if_hippisubr.c
if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c if_pppoe.c if_sl.c
if_srt.c if_stf.c if_strip.c if_tokensubr.c if_tun.c ppp_tty.c
radix.c route.c rtbl.c slcompress.c
src/sys/net/agr: if_agr.c if_agrsubr.c
src/sys/net80211: ieee80211.c ieee80211_crypto.c ieee80211_input.c
ieee80211_ioctl.c ieee80211_node.c ieee80211_output.c
ieee80211_proto.c
src/sys/netinet: dccp_cc_sw.c dccp_tcplike.c dccp_tfrc.c dccp_usrreq.c
if_arp.c if_atm.c igmp.c in.c in_gif.c in_pcb.c in_proto.c
in_selsrc.c ip_carp.c ip_ecn.c ip_encap.c ip_etherip.c ip_icmp.c
ip_input.c ip_mroute.c ip_output.c portalgo.c raw_ip.c
tcp_congctl.c tcp_debug.c tcp_input.c tcp_output.c tcp_sack.c
tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c udp_usrreq.c
src/sys/netinet6: dccp6_usrreq.c icmp6.c in6.c in6_gif.c in6_pcb.c
in6_proto.c in6_src.c ip6_etherip.c ip6_forward.c ip6_input.c
ip6_mroute.c ip6_output.c mld6.c nd6.c nd6_nbr.c raw_ip6.c
udp6_output.c udp6_usrreq.c
src/sys/netmpls: mpls_proto.c mpls_ttl.c mpls_var.h
Log Message:
sprinkle _KERNEL_OPT
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.245 -r1.246 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.121 -r1.122 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.67 -r1.68 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.43 -r1.44 src/sys/net/if_ecosubr.c \
src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.36 -r1.37 src/sys/net/if_etherip.c
cvs rdiff -u -r1.211 -r1.212 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.92 -r1.93 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_gif.c
cvs rdiff -u -r1.166 -r1.167 src/sys/net/if_gre.c
cvs rdiff -u -r1.49 -r1.50 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_loop.c
cvs rdiff -u -r1.18 -r1.19 src/sys/net/if_mpls.c
cvs rdiff -u -r1.148 -r1.149 src/sys/net/if_ppp.c src/sys/net/route.c
cvs rdiff -u -r1.103 -r1.104 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.120 -r1.121 src/sys/net/if_sl.c
cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_srt.c
cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_stf.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_strip.c
cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_tun.c
cvs rdiff -u -r1.58 -r1.59 src/sys/net/ppp_tty.c
cvs rdiff -u -r1.44 -r1.45 src/sys/net/radix.c
cvs rdiff -u -r1.1 -r1.2 src/sys/net/rtbl.c
cvs rdiff -u -r1.38 -r1.39 src/sys/net/slcompress.c
cvs rdiff -u -r1.32 -r1.33 src/sys/net/agr/if_agr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/net/agr/if_agrsubr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/net80211/ieee80211.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_crypto.c
cvs rdiff -u -r1.78 -r1.79 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.59 -r1.60 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.68 -r1.69 src/sys/net80211/ieee80211_node.c
cvs rdiff -u -r1.52 -r1.53 src/sys/net80211/ieee80211_output.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net80211/ieee80211_proto.c
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/dccp_cc_sw.c \
src/sys/netinet/dccp_tcplike.c src/sys/netinet/dccp_tfrc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.172 -r1.173 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.35 -r1.36 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.55 -r1.56 src/sys/netinet/igmp.c
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet/in.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.161 -r1.162 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.112 -r1.113 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/in_selsrc.c \
src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.61 -r1.62 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/ip_ecn.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netinet/ip_encap.c
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.323 -r1.324 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.131 -r1.132 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.245 -r1.246 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/portalgo.c
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.28 -r1.29 src/sys/netinet/tcp_debug.c
cvs rdiff -u -r1.343 -r1.344 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.184 -r1.185 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.31 -r1.32 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.262 -r1.263 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.88 -r1.89 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.208 -r1.209 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.221 -r1.222 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet6/dccp6_usrreq.c
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.189 -r1.190 src/sys/netinet6/in6.c
cvs rdiff -u -r1.61 -r1.62 src/sys/netinet6/in6_gif.c
cvs rdiff -u -r1.142 -r1.143 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.105 -r1.106 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.57 -r1.58 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.77 -r1.78 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.151 -r1.152 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.108 -r1.109 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.165 -r1.166 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.168 -r1.169 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.109 -r1.110 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.49 -r1.50 src/sys/netinet6/udp6_output.c
cvs rdiff -u -r1.120 -r1.121 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.28 -r1.29 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.4 -r1.5 src/sys/netmpls/mpls_ttl.c
cvs rdiff -u -r1.1 -r1.2 src/sys/netmpls/mpls_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.162 src/sys/kern/uipc_mbuf.c:1.163
--- src/sys/kern/uipc_mbuf.c:1.162 Fri Jul 24 12:29:55 2015
+++ src/sys/kern/uipc_mbuf.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.162 2015/07/24 12:29:55 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.163 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,11 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.162 2015/07/24 12:29:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.163 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.245 src/sys/kern/uipc_socket.c:1.246
--- src/sys/kern/uipc_socket.c:1.245 Sat May 9 15:22:47 2015
+++ src/sys/kern/uipc_socket.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.245 2015/05/09 15:22:47 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.246 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,14 +71,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.245 2015/05/09 15:22:47 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.246 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
#include "opt_sosend_loan.h"
#include "opt_mbuftrace.h"
#include "opt_somaxkva.h"
#include "opt_multiprocessor.h" /* XXX */
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.121 src/sys/kern/uipc_socket2.c:1.122
--- src/sys/kern/uipc_socket2.c:1.121 Fri Sep 5 05:57:21 2014
+++ src/sys/kern/uipc_socket2.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.121 2014/09/05 05:57:21 matt Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.122 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,10 +58,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.121 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.122 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
#include "opt_sb_max.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.179 src/sys/kern/uipc_syscalls.c:1.180
--- src/sys/kern/uipc_syscalls.c:1.179 Wed Jul 22 14:18:08 2015
+++ src/sys/kern/uipc_syscalls.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.180 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,9 +61,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.180 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_pipe.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.67 src/sys/net/if_arcsubr.c:1.68
--- src/sys/net/if_arcsubr.c:1.67 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_arcsubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.67 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.68 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,10 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.67 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.68 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
-
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_atmsubr.c
diff -u src/sys/net/if_atmsubr.c:1.53 src/sys/net/if_atmsubr.c:1.54
--- src/sys/net/if_atmsubr.c:1.53 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_atmsubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atmsubr.c,v 1.53 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_atmsubr.c,v 1.54 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.53 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.54 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_gateway.h"
#include "opt_natm.h"
-
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_ecosubr.c
diff -u src/sys/net/if_ecosubr.c:1.43 src/sys/net/if_ecosubr.c:1.44
--- src/sys/net/if_ecosubr.c:1.43 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_ecosubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ecosubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_ecosubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -58,9 +58,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/errno.h>
Index: src/sys/net/if_hippisubr.c
diff -u src/sys/net/if_hippisubr.c:1.43 src/sys/net/if_hippisubr.c:1.44
--- src/sys/net/if_hippisubr.c:1.43 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_hippisubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hippisubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_hippisubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -30,9 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
Index: src/sys/net/if_etherip.c
diff -u src/sys/net/if_etherip.c:1.36 src/sys/net/if_etherip.c:1.37
--- src/sys/net/if_etherip.c:1.36 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_etherip.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_etherip.c,v 1.37 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenf...@grumpf.hope-2000.org>
@@ -86,9 +86,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.37 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.211 src/sys/net/if_ethersubr.c:1.212
--- src/sys/net/if_ethersubr.c:1.211 Wed Aug 12 02:20:31 2015
+++ src/sys/net/if_ethersubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.211 2015/08/12 02:20:31 ozaki-r Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.212 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,8 +61,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.211 2015/08/12 02:20:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.212 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_mbuftrace.h"
@@ -70,6 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr
#include "opt_gateway.h"
#include "opt_pppoe.h"
#include "opt_net_mpsafe.h"
+#endif
+
#include "vlan.h"
#include "pppoe.h"
#include "bridge.h"
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.92 src/sys/net/if_fddisubr.c:1.93
--- src/sys/net/if_fddisubr.c:1.92 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_fddisubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.92 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,12 +96,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.92 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_gateway.h"
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_mbuftrace.h"
+#endif
#include <sys/param.h>
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.87 src/sys/net/if_gif.c:1.88
--- src/sys/net/if_gif.c:1.87 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_gif.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_gif.c,v 1.88 2015/08/24 22:21:26 pooka Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.88 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.166 src/sys/net/if_gre.c:1.167
--- src/sys/net/if_gre.c:1.166 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_gre.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.166 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_gre.c,v 1.167 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,12 +45,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.166 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.167 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_atalk.h"
#include "opt_gre.h"
#include "opt_inet.h"
#include "opt_mpls.h"
+#endif
#include <sys/param.h>
#include <sys/file.h>
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.49 src/sys/net/if_ieee1394subr.c:1.50
--- src/sys/net/if_ieee1394subr.c:1.49 Thu Jun 4 09:19:59 2015
+++ src/sys/net/if_ieee1394subr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.49 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.50 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,9 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.49 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.50 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.82 src/sys/net/if_loop.c:1.83
--- src/sys/net/if_loop.c:1.82 Mon May 25 08:29:01 2015
+++ src/sys/net/if_loop.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.82 2015/05/25 08:29:01 ozaki-r Exp $ */
+/* $NetBSD: if_loop.c,v 1.83 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,13 +65,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.82 2015/05/25 08:29:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.83 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_mbuftrace.h"
#include "opt_mpls.h"
#include "opt_net_mpsafe.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.18 src/sys/net/if_mpls.c:1.19
--- src/sys/net/if_mpls.c:1.18 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_mpls.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.18 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_mpls.c,v 1.19 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,10 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.18 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.19 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mpls.h"
+#endif
#include <sys/param.h>
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.148 src/sys/net/if_ppp.c:1.149
--- src/sys/net/if_ppp.c:1.148 Thu Aug 20 11:18:53 2015
+++ src/sys/net/if_ppp.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $ */
+/* $NetBSD: if_ppp.c,v 1.149 2015/08/24 22:21:26 pooka Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,13 +102,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.148 2015/08/20 11:18:53 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.149 2015/08/24 22:21:26 pooka Exp $");
#include "ppp.h"
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_gateway.h"
#include "opt_ppp.h"
+#endif
#ifdef INET
#define VJC
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.148 src/sys/net/route.c:1.149
--- src/sys/net/route.c:1.148 Thu Aug 13 10:14:26 2015
+++ src/sys/net/route.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.148 2015/08/13 10:14:26 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.149 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -90,11 +90,13 @@
* @(#)route.c 8.3 (Berkeley) 1/9/95
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_route.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.148 2015/08/13 10:14:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.149 2015/08/24 22:21:26 pooka Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.103 src/sys/net/if_pppoe.c:1.104
--- src/sys/net/if_pppoe.c:1.103 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_pppoe.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.103 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.104 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,10 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.103 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.104 2015/08/24 22:21:26 pooka Exp $");
#include "pppoe.h"
+
+#ifdef _KERNEL_OPT
#include "opt_pppoe.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.120 src/sys/net/if_sl.c:1.121
--- src/sys/net/if_sl.c:1.120 Thu Aug 20 11:18:53 2015
+++ src/sys/net/if_sl.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $ */
+/* $NetBSD: if_sl.c,v 1.121 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,9 +60,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.120 2015/08/20 11:18:53 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.121 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/net/if_srt.c
diff -u src/sys/net/if_srt.c:1.19 src/sys/net/if_srt.c:1.20
--- src/sys/net/if_srt.c:1.19 Fri Jul 25 08:10:40 2014
+++ src/sys/net/if_srt.c Mon Aug 24 22:21:26 2015
@@ -1,10 +1,12 @@
-/* $NetBSD: if_srt.c,v 1.19 2014/07/25 08:10:40 dholland Exp $ */
+/* $NetBSD: if_srt.c,v 1.20 2015/08/24 22:21:26 pooka Exp $ */
/* This file is in the public domain. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.19 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.20 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#if !defined(INET) && !defined(INET6)
#error "srt without INET/INET6?"
Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.81 src/sys/net/if_stf.c:1.82
--- src/sys/net/if_stf.c:1.81 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_stf.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stf.c,v 1.81 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_stf.c,v 1.82 2015/08/24 22:21:26 pooka Exp $ */
/* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
/*
@@ -75,9 +75,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.81 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.82 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
+
#ifndef INET6
#error "pseudo-device stf requires options INET6"
#endif
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.100 src/sys/net/if_strip.c:1.101
--- src/sys/net/if_strip.c:1.100 Tue Jul 14 08:44:59 2015
+++ src/sys/net/if_strip.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_strip.c,v 1.100 2015/07/14 08:44:59 ozaki-r Exp $ */
+/* $NetBSD: if_strip.c,v 1.101 2015/08/24 22:21:26 pooka Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@@ -87,9 +87,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.100 2015/07/14 08:44:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.101 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.69 src/sys/net/if_tokensubr.c:1.70
--- src/sys/net/if_tokensubr.c:1.69 Wed Jul 1 03:39:36 2015
+++ src/sys/net/if_tokensubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.69 2015/07/01 03:39:36 ozaki-r Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.70 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,12 +92,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.69 2015/07/01 03:39:36 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.70 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_gateway.h"
-
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.122 src/sys/net/if_tun.c:1.123
--- src/sys/net/if_tun.c:1.122 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_tun.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.122 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_tun.c,v 1.123 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -15,9 +15,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.122 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.123 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/net/ppp_tty.c
diff -u src/sys/net/ppp_tty.c:1.58 src/sys/net/ppp_tty.c:1.59
--- src/sys/net/ppp_tty.c:1.58 Thu May 22 16:31:19 2014
+++ src/sys/net/ppp_tty.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ppp_tty.c,v 1.58 2014/05/22 16:31:19 dholland Exp $ */
+/* $NetBSD: ppp_tty.c,v 1.59 2015/08/24 22:21:26 pooka Exp $ */
/* Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp */
/*
@@ -93,11 +93,13 @@
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.58 2014/05/22 16:31:19 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.59 2015/08/24 22:21:26 pooka Exp $");
#include "ppp.h"
+#ifdef _KERNEL_OPT
#include "opt_ppp.h"
+#endif
#define VJC
#define PPP_COMPRESS
Index: src/sys/net/radix.c
diff -u src/sys/net/radix.c:1.44 src/sys/net/radix.c:1.45
--- src/sys/net/radix.c:1.44 Sun Jul 17 20:54:52 2011
+++ src/sys/net/radix.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: radix.c,v 1.44 2011/07/17 20:54:52 joerg Exp $ */
+/* $NetBSD: radix.c,v 1.45 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1988, 1989, 1993
@@ -36,14 +36,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radix.c,v 1.44 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radix.c,v 1.45 2015/08/24 22:21:26 pooka Exp $");
#ifndef _NET_RADIX_H_
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/kmem.h>
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/systm.h>
#include <sys/malloc.h>
Index: src/sys/net/rtbl.c
diff -u src/sys/net/rtbl.c:1.1 src/sys/net/rtbl.c:1.2
--- src/sys/net/rtbl.c:1.1 Thu Mar 31 19:40:52 2011
+++ src/sys/net/rtbl.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtbl.c,v 1.1 2011/03/31 19:40:52 dyoung Exp $ */
+/* $NetBSD: rtbl.c,v 1.2 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 1998, 2008, 2011 The NetBSD Foundation, Inc.
@@ -90,12 +90,12 @@
* @(#)route.c 8.3 (Berkeley) 1/9/95
*/
-#ifdef _KERNEL
+#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_route.h"
-#endif /* _KERNEL */
+#endif /* _KERNEL && _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtbl.c,v 1.1 2011/03/31 19:40:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtbl.c,v 1.2 2015/08/24 22:21:26 pooka Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
Index: src/sys/net/slcompress.c
diff -u src/sys/net/slcompress.c:1.38 src/sys/net/slcompress.c:1.39
--- src/sys/net/slcompress.c:1.38 Sat Apr 18 15:20:06 2009
+++ src/sys/net/slcompress.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: slcompress.c,v 1.38 2009/04/18 15:20:06 tsutsui Exp $ */
+/* $NetBSD: slcompress.c,v 1.39 2015/08/24 22:21:26 pooka Exp $ */
/* Id: slcompress.c,v 1.3 1996/05/24 07:04:47 paulus Exp */
/*
@@ -41,9 +41,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slcompress.c,v 1.38 2009/04/18 15:20:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slcompress.c,v 1.39 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
+
#ifdef INET
#include <sys/param.h>
#include <sys/mbuf.h>
Index: src/sys/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.32 src/sys/net/agr/if_agr.c:1.33
--- src/sys/net/agr/if_agr.c:1.32 Thu Aug 20 14:40:18 2015
+++ src/sys/net/agr/if_agr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: if_agr.c,v 1.33 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,9 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.33 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/callout.h>
Index: src/sys/net/agr/if_agrsubr.c
diff -u src/sys/net/agr/if_agrsubr.c:1.9 src/sys/net/agr/if_agrsubr.c:1.10
--- src/sys/net/agr/if_agrsubr.c:1.9 Tue Jan 19 22:08:17 2010
+++ src/sys/net/agr/if_agrsubr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agrsubr.c,v 1.9 2010/01/19 22:08:17 pooka Exp $ */
+/* $NetBSD: if_agrsubr.c,v 1.10 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,9 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agrsubr.c,v 1.9 2010/01/19 22:08:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agrsubr.c,v 1.10 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/callout.h>
Index: src/sys/net80211/ieee80211.c
diff -u src/sys/net80211/ieee80211.c:1.55 src/sys/net80211/ieee80211.c:1.56
--- src/sys/net80211/ieee80211.c:1.55 Sat Oct 18 08:33:29 2014
+++ src/sys/net80211/ieee80211.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.c,v 1.55 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: ieee80211.c,v 1.56 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,14 +36,16 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.22 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.55 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.56 2015/08/24 22:21:26 pooka Exp $");
#endif
/*
* IEEE 802.11 generic handler
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net80211/ieee80211_crypto.c
diff -u src/sys/net80211/ieee80211_crypto.c:1.16 src/sys/net80211/ieee80211_crypto.c:1.17
--- src/sys/net80211/ieee80211_crypto.c:1.16 Fri Sep 13 20:19:53 2013
+++ src/sys/net80211/ieee80211_crypto.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $ */
+/* $NetBSD: ieee80211_crypto.c,v 1.17 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,10 +36,12 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.12 2005/08/08 18:46:35 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto.c,v 1.17 2015/08/24 22:21:26 pooka Exp $");
#endif
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
/*
* IEEE 802.11 generic crypto support.
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.78 src/sys/net80211/ieee80211_input.c:1.79
--- src/sys/net80211/ieee80211_input.c:1.78 Sat Oct 18 08:33:29 2014
+++ src/sys/net80211/ieee80211_input.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.78 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.79 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,10 +36,12 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.78 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.79 2015/08/24 22:21:26 pooka Exp $");
#endif
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#ifdef __NetBSD__
#endif /* __NetBSD__ */
Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.59 src/sys/net80211/ieee80211_ioctl.c:1.60
--- src/sys/net80211/ieee80211_ioctl.c:1.59 Sat Jan 25 00:59:44 2014
+++ src/sys/net80211/ieee80211_ioctl.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_ioctl.c,v 1.59 2014/01/25 00:59:44 christos Exp $ */
+/* $NetBSD: ieee80211_ioctl.c,v 1.60 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,15 +36,17 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.59 2014/01/25 00:59:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60 2015/08/24 22:21:26 pooka Exp $");
#endif
/*
* IEEE 802.11 ioctl support (FreeBSD-specific)
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/endian.h>
#include <sys/param.h>
Index: src/sys/net80211/ieee80211_node.c
diff -u src/sys/net80211/ieee80211_node.c:1.68 src/sys/net80211/ieee80211_node.c:1.69
--- src/sys/net80211/ieee80211_node.c:1.68 Sat Oct 18 08:33:29 2014
+++ src/sys/net80211/ieee80211_node.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.c,v 1.68 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: ieee80211_node.c,v 1.69 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,10 +36,12 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.68 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.69 2015/08/24 22:21:26 pooka Exp $");
#endif
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/net80211/ieee80211_output.c
diff -u src/sys/net80211/ieee80211_output.c:1.52 src/sys/net80211/ieee80211_output.c:1.53
--- src/sys/net80211/ieee80211_output.c:1.52 Sat Oct 18 08:33:29 2014
+++ src/sys/net80211/ieee80211_output.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_output.c,v 1.52 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: ieee80211_output.c,v 1.53 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,10 +36,12 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.34 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.52 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.53 2015/08/24 22:21:26 pooka Exp $");
#endif
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#ifdef __NetBSD__
#endif /* __NetBSD__ */
Index: src/sys/net80211/ieee80211_proto.c
diff -u src/sys/net80211/ieee80211_proto.c:1.30 src/sys/net80211/ieee80211_proto.c:1.31
--- src/sys/net80211/ieee80211_proto.c:1.30 Thu Jan 10 17:40:10 2013
+++ src/sys/net80211/ieee80211_proto.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_proto.c,v 1.30 2013/01/10 17:40:10 christos Exp $ */
+/* $NetBSD: ieee80211_proto.c,v 1.31 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,14 +36,16 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.23 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_proto.c,v 1.30 2013/01/10 17:40:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_proto.c,v 1.31 2015/08/24 22:21:26 pooka Exp $");
#endif
/*
* IEEE 802.11 protocol support.
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/netinet/dccp_cc_sw.c
diff -u src/sys/netinet/dccp_cc_sw.c:1.1 src/sys/netinet/dccp_cc_sw.c:1.2
--- src/sys/netinet/dccp_cc_sw.c:1.1 Tue Feb 10 19:11:52 2015
+++ src/sys/netinet/dccp_cc_sw.c Mon Aug 24 22:21:26 2015
@@ -1,5 +1,5 @@
/* $KAME: dccp_cc_sw.c,v 1.9 2005/10/21 05:33:51 nishida Exp $ */
-/* $NetBSD: dccp_cc_sw.c,v 1.1 2015/02/10 19:11:52 rjs Exp $ */
+/* $NetBSD: dccp_cc_sw.c,v 1.2 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_cc_sw.c,v 1.1 2015/02/10 19:11:52 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_cc_sw.c,v 1.2 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_dccp.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/dccp_tcplike.c
diff -u src/sys/netinet/dccp_tcplike.c:1.1 src/sys/netinet/dccp_tcplike.c:1.2
--- src/sys/netinet/dccp_tcplike.c:1.1 Tue Feb 10 19:11:52 2015
+++ src/sys/netinet/dccp_tcplike.c Mon Aug 24 22:21:26 2015
@@ -1,5 +1,5 @@
/* $KAME: dccp_tcplike.c,v 1.19 2005/07/27 06:27:25 nishida Exp $ */
-/* $NetBSD: dccp_tcplike.c,v 1.1 2015/02/10 19:11:52 rjs Exp $ */
+/* $NetBSD: dccp_tcplike.c,v 1.2 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2003 Magnus Erixzon
@@ -33,9 +33,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.1 2015/02/10 19:11:52 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.2 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_dccp.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.1 src/sys/netinet/dccp_tfrc.c:1.2
--- src/sys/netinet/dccp_tfrc.c:1.1 Tue Feb 10 19:11:52 2015
+++ src/sys/netinet/dccp_tfrc.c Mon Aug 24 22:21:26 2015
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.c,v 1.1 2015/02/10 19:11:52 rjs Exp $ */
+/* $NetBSD: dccp_tfrc.c,v 1.2 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.1 2015/02/10 19:11:52 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.2 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_dccp.h"
+#endif
/*
* This implementation conforms to the drafts of DCCP dated Mars 2003.
Index: src/sys/netinet/dccp_usrreq.c
diff -u src/sys/netinet/dccp_usrreq.c:1.6 src/sys/netinet/dccp_usrreq.c:1.7
--- src/sys/netinet/dccp_usrreq.c:1.6 Sat May 2 17:18:03 2015
+++ src/sys/netinet/dccp_usrreq.c Mon Aug 24 22:21:26 2015
@@ -1,5 +1,5 @@
/* $KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $ */
-/* $NetBSD: dccp_usrreq.c,v 1.6 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: dccp_usrreq.c,v 1.7 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson
@@ -67,10 +67,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.6 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.7 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_dccp.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.172 src/sys/netinet/if_arp.c:1.173
--- src/sys/netinet/if_arp.c:1.172 Wed Aug 12 07:13:14 2015
+++ src/sys/netinet/if_arp.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.172 2015/08/12 07:13:14 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.173 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,10 +68,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.172 2015/08/12 07:13:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.173 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_inet.h"
+#endif
#ifdef INET
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.35 src/sys/netinet/if_atm.c:1.36
--- src/sys/netinet/if_atm.c:1.35 Fri Jul 17 02:21:08 2015
+++ src/sys/netinet/if_atm.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.35 2015/07/17 02:21:08 ozaki-r Exp $ */
+/* $NetBSD: if_atm.c,v 1.36 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,10 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.35 2015/07/17 02:21:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.36 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_natm.h"
+#endif
#if defined(INET) || defined(INET6)
Index: src/sys/netinet/igmp.c
diff -u src/sys/netinet/igmp.c:1.55 src/sys/netinet/igmp.c:1.56
--- src/sys/netinet/igmp.c:1.55 Thu May 29 23:02:48 2014
+++ src/sys/netinet/igmp.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.c,v 1.55 2014/05/29 23:02:48 rmind Exp $ */
+/* $NetBSD: igmp.c,v 1.56 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -40,9 +40,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.55 2014/05/29 23:02:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.56 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
+#endif
#include <sys/param.h>
#include <sys/mbuf.h>
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.156 src/sys/netinet/in.c:1.157
--- src/sys/netinet/in.c:1.156 Sat May 16 12:12:46 2015
+++ src/sys/netinet/in.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.156 2015/05/16 12:12:46 roy Exp $ */
+/* $NetBSD: in.c,v 1.157 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,12 +91,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.156 2015/05/16 12:12:46 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.157 2015/08/24 22:21:26 pooka Exp $");
#include "arp.h"
+
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet_conf.h"
#include "opt_mrouting.h"
+#endif
#include <sys/param.h>
#include <sys/ioctl.h>
Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.64 src/sys/netinet/in_gif.c:1.65
--- src/sys/netinet/in_gif.c:1.64 Sun May 18 14:46:16 2014
+++ src/sys/netinet/in_gif.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_gif.c,v 1.64 2014/05/18 14:46:16 rmind Exp $ */
+/* $NetBSD: in_gif.c,v 1.65 2015/08/24 22:21:26 pooka Exp $ */
/* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
/*
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.64 2014/05/18 14:46:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.65 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.161 src/sys/netinet/in_pcb.c:1.162
--- src/sys/netinet/in_pcb.c:1.161 Sun May 24 15:43:45 2015
+++ src/sys/netinet/in_pcb.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr Exp $ */
+/* $NetBSD: in_pcb.c,v 1.162 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,10 +93,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.162 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.112 src/sys/netinet/in_proto.c:1.113
--- src/sys/netinet/in_proto.c:1.112 Sat May 2 14:41:32 2015
+++ src/sys/netinet/in_proto.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.c,v 1.112 2015/05/02 14:41:32 roy Exp $ */
+/* $NetBSD: in_proto.c,v 1.113 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,8 +61,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.112 2015/05/02 14:41:32 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.113 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -70,6 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v
#include "opt_gateway.h"
#include "opt_dccp.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/param.h>
#include <sys/socket.h>
Index: src/sys/netinet/in_selsrc.c
diff -u src/sys/netinet/in_selsrc.c:1.13 src/sys/netinet/in_selsrc.c:1.14
--- src/sys/netinet/in_selsrc.c:1.13 Mon Jun 8 07:59:54 2015
+++ src/sys/netinet/in_selsrc.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_selsrc.c,v 1.13 2015/06/08 07:59:54 roy Exp $ */
+/* $NetBSD: in_selsrc.c,v 1.14 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
@@ -29,10 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.13 2015/06/08 07:59:54 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.14 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet_conf.h"
+#endif
#include <lib/libkern/libkern.h>
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.13 src/sys/netinet/tcp_vtw.c:1.14
--- src/sys/netinet/tcp_vtw.c:1.13 Tue Mar 31 08:47:01 2015
+++ src/sys/netinet/tcp_vtw.c Mon Aug 24 22:21:26 2015
@@ -76,10 +76,12 @@
#include <sys/cdefs.h>
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_inet.h"
#include "opt_inet_csum.h"
#include "opt_tcp_debug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +124,7 @@
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.13 2015/03/31 08:47:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.14 2015/08/24 22:21:26 pooka Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.61 src/sys/netinet/ip_carp.c:1.62
--- src/sys/netinet/ip_carp.c:1.61 Thu Aug 20 14:40:19 2015
+++ src/sys/netinet/ip_carp.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.61 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: ip_carp.c,v 1.62 2015/08/24 22:21:26 pooka Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -27,11 +27,13 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mbuftrace.h"
+#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.61 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.62 2015/08/24 22:21:26 pooka Exp $");
/*
* TODO:
Index: src/sys/netinet/ip_ecn.c
diff -u src/sys/netinet/ip_ecn.c:1.15 src/sys/netinet/ip_ecn.c:1.16
--- src/sys/netinet/ip_ecn.c:1.15 Tue Sep 5 00:29:36 2006
+++ src/sys/netinet/ip_ecn.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_ecn.c,v 1.15 2006/09/05 00:29:36 rpaulo Exp $ */
+/* $NetBSD: ip_ecn.c,v 1.16 2015/08/24 22:21:26 pooka Exp $ */
/* $KAME: ip_ecn.c,v 1.11 2001/05/03 16:09:29 itojun Exp $ */
/*
@@ -36,9 +36,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_ecn.c,v 1.15 2006/09/05 00:29:36 rpaulo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_ecn.c,v 1.16 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.45 src/sys/netinet/ip_encap.c:1.46
--- src/sys/netinet/ip_encap.c:1.45 Mon Apr 20 07:34:48 2015
+++ src/sys/netinet/ip_encap.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.c,v 1.45 2015/04/20 07:34:48 ozaki-r Exp $ */
+/* $NetBSD: ip_encap.c,v 1.46 2015/08/24 22:21:26 pooka Exp $ */
/* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */
/*
@@ -70,10 +70,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.45 2015/04/20 07:34:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.46 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/ip_etherip.c
diff -u src/sys/netinet/ip_etherip.c:1.14 src/sys/netinet/ip_etherip.c:1.15
--- src/sys/netinet/ip_etherip.c:1.14 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet/ip_etherip.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_etherip.c,v 1.14 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: ip_etherip.c,v 1.15 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenf...@grumpf.hope-2000.org>
@@ -58,9 +58,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_etherip.c,v 1.14 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_etherip.c,v 1.15 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.140 src/sys/netinet/ip_icmp.c:1.141
--- src/sys/netinet/ip_icmp.c:1.140 Sat May 9 18:47:26 2015
+++ src/sys/netinet/ip_icmp.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.140 2015/05/09 18:47:26 christos Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.141 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,9 +94,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.140 2015/05/09 18:47:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.141 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.323 src/sys/netinet/ip_input.c:1.324
--- src/sys/netinet/ip_input.c:1.323 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet/ip_input.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.323 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: ip_input.c,v 1.324 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,8 +91,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.323 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.324 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
#include "opt_gateway.h"
@@ -100,6 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v
#include "opt_mrouting.h"
#include "opt_mbuftrace.h"
#include "opt_inet_csum.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.131 src/sys/netinet/ip_mroute.c:1.132
--- src/sys/netinet/ip_mroute.c:1.131 Sat Oct 18 08:33:29 2014
+++ src/sys/netinet/ip_mroute.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.131 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.132 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,11 +93,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.131 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.132 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_pim.h"
+#endif
#ifdef PIM
#define _PIM_VT 1
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.245 src/sys/netinet/ip_output.c:1.246
--- src/sys/netinet/ip_output.c:1.245 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet/ip_output.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.245 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: ip_output.c,v 1.246 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,13 +91,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.245 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.246 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_mrouting.h"
#include "opt_net_mpsafe.h"
#include "opt_mpls.h"
+#endif
#include <sys/param.h>
#include <sys/kmem.h>
Index: src/sys/netinet/portalgo.c
diff -u src/sys/netinet/portalgo.c:1.8 src/sys/netinet/portalgo.c:1.9
--- src/sys/netinet/portalgo.c:1.8 Tue Feb 10 19:11:52 2015
+++ src/sys/netinet/portalgo.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: portalgo.c,v 1.8 2015/02/10 19:11:52 rjs Exp $ */
+/* $NetBSD: portalgo.c,v 1.9 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright 2011 Vlad Balan
@@ -34,9 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.8 2015/02/10 19:11:52 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.9 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/errno.h>
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.152 src/sys/netinet/raw_ip.c:1.153
--- src/sys/netinet/raw_ip.c:1.152 Sat May 2 17:18:03 2015
+++ src/sys/netinet/raw_ip.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.152 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.153 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,12 +65,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.152 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.153 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
#include "opt_ipsec.h"
#include "opt_mrouting.h"
+#endif
#include <sys/param.h>
#include <sys/sysctl.h>
Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.19 src/sys/netinet/tcp_congctl.c:1.20
--- src/sys/netinet/tcp_congctl.c:1.19 Mon Nov 18 11:48:34 2013
+++ src/sys/netinet/tcp_congctl.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.19 2013/11/18 11:48:34 kefren Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.20 2015/08/24 22:21:26 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
@@ -135,11 +135,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.19 2013/11/18 11:48:34 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.20 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_tcp_debug.h"
#include "opt_tcp_congctl.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/tcp_debug.c
diff -u src/sys/netinet/tcp_debug.c:1.28 src/sys/netinet/tcp_debug.c:1.29
--- src/sys/netinet/tcp_debug.c:1.28 Sat Apr 18 14:58:05 2009
+++ src/sys/netinet/tcp_debug.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_debug.c,v 1.28 2009/04/18 14:58:05 tsutsui Exp $ */
+/* $NetBSD: tcp_debug.c,v 1.29 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,10 +61,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.28 2009/04/18 14:58:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.29 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_tcp_debug.h"
+#endif
/* load symbolic names */
#define PRUREQUESTS
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.343 src/sys/netinet/tcp_input.c:1.344
--- src/sys/netinet/tcp_input.c:1.343 Fri Jul 24 04:31:20 2015
+++ src/sys/netinet/tcp_input.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.343 2015/07/24 04:31:20 matt Exp $ */
+/* $NetBSD: tcp_input.c,v 1.344 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,12 +148,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.343 2015/07/24 04:31:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.344 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_inet_csum.h"
#include "opt_tcp_debug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.184 src/sys/netinet/tcp_output.c:1.185
--- src/sys/netinet/tcp_output.c:1.184 Fri Jul 24 04:33:50 2015
+++ src/sys/netinet/tcp_output.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $ */
+/* $NetBSD: tcp_output.c,v 1.185 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,11 +135,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.185 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_tcp_debug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.31 src/sys/netinet/tcp_sack.c:1.32
--- src/sys/netinet/tcp_sack.c:1.31 Tue Mar 31 08:47:01 2015
+++ src/sys/netinet/tcp_sack.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.31 2015/03/31 08:47:01 ozaki-r Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,12 +102,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.31 2015/03/31 08:47:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet_csum.h"
#include "opt_tcp_debug.h"
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.262 src/sys/netinet/tcp_subr.c:1.263
--- src/sys/netinet/tcp_subr.c:1.262 Tue May 19 17:33:43 2015
+++ src/sys/netinet/tcp_subr.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.262 2015/05/19 17:33:43 kefren Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.263 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,13 +91,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.262 2015/05/19 17:33:43 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.263 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_tcp_compat_42.h"
#include "opt_inet_csum.h"
#include "opt_mbuftrace.h"
+#endif
#include <sys/param.h>
#include <sys/atomic.h>
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.88 src/sys/netinet/tcp_timer.c:1.89
--- src/sys/netinet/tcp_timer.c:1.88 Mon Nov 10 18:52:51 2014
+++ src/sys/netinet/tcp_timer.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.88 2014/11/10 18:52:51 maxv Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.89 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,10 +93,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.88 2014/11/10 18:52:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.89 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_tcp_debug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.208 src/sys/netinet/tcp_usrreq.c:1.209
--- src/sys/netinet/tcp_usrreq.c:1.208 Sat May 2 17:18:03 2015
+++ src/sys/netinet/tcp_usrreq.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.208 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.209 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,11 +99,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.208 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.209 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_tcp_debug.h"
#include "opt_mbuftrace.h"
+#include "opt_tcp_space.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,8 +156,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c
#include <netinet/tcp_debug.h>
#include <netinet/tcp_vtw.h>
-#include "opt_tcp_space.h"
-
static int
tcp_debug_capture(struct tcpcb *tp, int req)
{
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.221 src/sys/netinet/udp_usrreq.c:1.222
--- src/sys/netinet/udp_usrreq.c:1.221 Sat May 2 17:18:03 2015
+++ src/sys/netinet/udp_usrreq.c Mon Aug 24 22:21:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.221 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.222 2015/08/24 22:21:26 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,14 +66,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.221 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.222 2015/08/24 22:21:26 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
#include "opt_ipsec.h"
#include "opt_inet_csum.h"
#include "opt_ipkdb.h"
#include "opt_mbuftrace.h"
+#endif
#include <sys/param.h>
#include <sys/mbuf.h>
Index: src/sys/netinet6/dccp6_usrreq.c
diff -u src/sys/netinet6/dccp6_usrreq.c:1.6 src/sys/netinet6/dccp6_usrreq.c:1.7
--- src/sys/netinet6/dccp6_usrreq.c:1.6 Sat May 2 17:18:03 2015
+++ src/sys/netinet6/dccp6_usrreq.c Mon Aug 24 22:21:27 2015
@@ -1,5 +1,5 @@
/* $KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $ */
-/* $NetBSD: dccp6_usrreq.c,v 1.6 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: dccp6_usrreq.c,v 1.7 2015/08/24 22:21:27 pooka Exp $ */
/*
* Copyright (C) 2003 WIDE Project.
@@ -31,10 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.6 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.7 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_dccp.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.174 src/sys/netinet6/icmp6.c:1.175
--- src/sys/netinet6/icmp6.c:1.174 Mon Aug 24 09:45:29 2015
+++ src/sys/netinet6/icmp6.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.175 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,10 +62,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.175 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.189 src/sys/netinet6/in6.c:1.190
--- src/sys/netinet6/in6.c:1.189 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet6/in6.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.189 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.190 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,10 +62,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.189 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.190 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/param.h>
#include <sys/ioctl.h>
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.61 src/sys/netinet6/in6_gif.c:1.62
--- src/sys/netinet6/in6_gif.c:1.61 Fri Apr 24 07:51:43 2015
+++ src/sys/netinet6/in6_gif.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.61 2015/04/24 07:51:43 ozaki-r Exp $ */
+/* $NetBSD: in6_gif.c,v 1.62 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.61 2015/04/24 07:51:43 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.62 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.142 src/sys/netinet6/in6_pcb.c:1.143
--- src/sys/netinet6/in6_pcb.c:1.142 Sun May 24 15:43:45 2015
+++ src/sys/netinet6/in6_pcb.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.142 2015/05/24 15:43:45 rtr Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.143 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,10 +62,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.142 2015/05/24 15:43:45 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.143 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.105 src/sys/netinet6/in6_proto.c:1.106
--- src/sys/netinet6/in6_proto.c:1.105 Wed Apr 22 19:46:08 2015
+++ src/sys/netinet6/in6_proto.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.105 2015/04/22 19:46:08 roy Exp $ */
+/* $NetBSD: in6_proto.c,v 1.106 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,12 +62,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.105 2015/04/22 19:46:08 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.106 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_gateway.h"
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_dccp.h"
+#endif
#include <sys/param.h>
#include <sys/socket.h>
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.57 src/sys/netinet6/in6_src.c:1.58
--- src/sys/netinet6/in6_src.c:1.57 Mon Apr 27 02:59:44 2015
+++ src/sys/netinet6/in6_src.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.57 2015/04/27 02:59:44 ozaki-r Exp $ */
+/* $NetBSD: in6_src.c,v 1.58 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,9 +66,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.57 2015/04/27 02:59:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.58 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/ip6_etherip.c
diff -u src/sys/netinet6/ip6_etherip.c:1.15 src/sys/netinet6/ip6_etherip.c:1.16
--- src/sys/netinet6/ip6_etherip.c:1.15 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet6/ip6_etherip.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_etherip.c,v 1.15 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: ip6_etherip.c,v 1.16 2015/08/24 22:21:27 pooka Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenf...@grumpf.hope-2000.org>
@@ -58,9 +58,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_etherip.c,v 1.15 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_etherip.c,v 1.16 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.77 src/sys/netinet6/ip6_forward.c:1.78
--- src/sys/netinet6/ip6_forward.c:1.77 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet6/ip6_forward.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.77 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.78 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,10 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.77 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.78 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_gateway.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.151 src/sys/netinet6/ip6_input.c:1.152
--- src/sys/netinet6/ip6_input.c:1.151 Wed Apr 1 02:49:44 2015
+++ src/sys/netinet6/ip6_input.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.151 2015/04/01 02:49:44 ozaki-r Exp $ */
+/* $NetBSD: ip6_input.c,v 1.152 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,13 +62,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.151 2015/04/01 02:49:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.152 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_gateway.h"
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.108 src/sys/netinet6/ip6_mroute.c:1.109
--- src/sys/netinet6/ip6_mroute.c:1.108 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet6/ip6_mroute.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.108 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.109 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,10 +117,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.108 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.109 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mrouting.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.165 src/sys/netinet6/ip6_output.c:1.166
--- src/sys/netinet6/ip6_output.c:1.165 Mon Apr 27 10:14:44 2015
+++ src/sys/netinet6/ip6_output.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.165 2015/04/27 10:14:44 ozaki-r Exp $ */
+/* $NetBSD: ip6_output.c,v 1.166 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,11 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.165 2015/04/27 10:14:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.166 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/malloc.h>
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.62 src/sys/netinet6/mld6.c:1.63
--- src/sys/netinet6/mld6.c:1.62 Tue Jan 20 21:27:36 2015
+++ src/sys/netinet6/mld6.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.62 2015/01/20 21:27:36 roy Exp $ */
+/* $NetBSD: mld6.c,v 1.63 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,9 +102,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.62 2015/01/20 21:27:36 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.63 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.168 src/sys/netinet6/nd6.c:1.169
--- src/sys/netinet6/nd6.c:1.168 Tue Aug 11 09:30:32 2015
+++ src/sys/netinet6/nd6.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.168 2015/08/11 09:30:32 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.169 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.168 2015/08/11 09:30:32 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.169 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
+#endif
#include "bridge.h"
#include "carp.h"
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.109 src/sys/netinet6/nd6_nbr.c:1.110
--- src/sys/netinet6/nd6_nbr.c:1.109 Fri Jul 17 02:21:08 2015
+++ src/sys/netinet6/nd6_nbr.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.109 2015/07/17 02:21:08 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.110 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.109 2015/07/17 02:21:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.110 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.140 src/sys/netinet6/raw_ip6.c:1.141
--- src/sys/netinet6/raw_ip6.c:1.140 Sat May 2 17:18:03 2015
+++ src/sys/netinet6/raw_ip6.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.140 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.141 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,9 +62,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.140 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.141 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/sysctl.h>
Index: src/sys/netinet6/udp6_output.c
diff -u src/sys/netinet6/udp6_output.c:1.49 src/sys/netinet6/udp6_output.c:1.50
--- src/sys/netinet6/udp6_output.c:1.49 Sat May 2 17:18:03 2015
+++ src/sys/netinet6/udp6_output.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_output.c,v 1.49 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: udp6_output.c,v 1.50 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
/*
@@ -62,9 +62,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.49 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.50 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/mbuf.h>
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.120 src/sys/netinet6/udp6_usrreq.c:1.121
--- src/sys/netinet6/udp6_usrreq.c:1.120 Sat May 2 17:18:03 2015
+++ src/sys/netinet6/udp6_usrreq.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.120 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.121 2015/08/24 22:21:27 pooka Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/*
@@ -62,11 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.120 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.121 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet_csum.h"
#include "opt_ipsec.h"
+#endif
#include <sys/param.h>
#include <sys/mbuf.h>
Index: src/sys/netmpls/mpls_proto.c
diff -u src/sys/netmpls/mpls_proto.c:1.28 src/sys/netmpls/mpls_proto.c:1.29
--- src/sys/netmpls/mpls_proto.c:1.28 Sat May 2 17:18:04 2015
+++ src/sys/netmpls/mpls_proto.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_proto.c,v 1.28 2015/05/02 17:18:04 rtr Exp $ */
+/* $NetBSD: mpls_proto.c,v 1.29 2015/08/24 22:21:27 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,10 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.28 2015/05/02 17:18:04 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.29 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mbuftrace.h"
+#endif
#include <sys/param.h>
#include <sys/socket.h>
Index: src/sys/netmpls/mpls_ttl.c
diff -u src/sys/netmpls/mpls_ttl.c:1.4 src/sys/netmpls/mpls_ttl.c:1.5
--- src/sys/netmpls/mpls_ttl.c:1.4 Wed Aug 7 06:55:00 2013
+++ src/sys/netmpls/mpls_ttl.c Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_ttl.c,v 1.4 2013/08/07 06:55:00 kefren Exp $ */
+/* $NetBSD: mpls_ttl.c,v 1.5 2015/08/24 22:21:27 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -97,10 +97,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpls_ttl.c,v 1.4 2013/08/07 06:55:00 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpls_ttl.c,v 1.5 2015/08/24 22:21:27 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mpls.h"
+#endif
#include <sys/param.h>
#include <sys/malloc.h>
Index: src/sys/netmpls/mpls_var.h
diff -u src/sys/netmpls/mpls_var.h:1.1 src/sys/netmpls/mpls_var.h:1.2
--- src/sys/netmpls/mpls_var.h:1.1 Sat Jun 26 14:24:29 2010
+++ src/sys/netmpls/mpls_var.h Mon Aug 24 22:21:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_var.h,v 1.1 2010/06/26 14:24:29 kefren Exp $ */
+/* $NetBSD: mpls_var.h,v 1.2 2015/08/24 22:21:27 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -36,7 +36,9 @@
#error This file should NOT be included anywhere else than kernel
#endif
+#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
+#endif
#include "netmpls/mpls.h"
