Module Name: src Committed By: ozaki-r Date: Tue Apr 26 08:44:45 UTC 2016
Modified Files: src/sys/netinet: dccp_cc_sw.c dccp_tcplike.c dccp_tfrc.c igmp.c in_pcb.h in_proto.c ip_encap.c ip_mroute.c ip_reass.c portalgo.c raw_ip.c tcp_congctl.c tcp_debug.c tcp_timer.c tcp_usrreq.c tcp_vtw.c tcp_vtw.h udp_usrreq.c src/sys/netinet6: dccp6_usrreq.c dest6.c in6_proto.c nd6_rtr.c raw_ip6.c scope6.c udp6_usrreq.c src/sys/netmpls: mpls_ttl.c Log Message: Sweep unnecessary route.h inclusions To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/dccp_cc_sw.c \ src/sys/netinet/dccp_tcplike.c src/sys/netinet/dccp_tfrc.c cvs rdiff -u -r1.56 -r1.57 src/sys/netinet/igmp.c cvs rdiff -u -r1.59 -r1.60 src/sys/netinet/in_pcb.h cvs rdiff -u -r1.119 -r1.120 src/sys/netinet/in_proto.c cvs rdiff -u -r1.52 -r1.53 src/sys/netinet/ip_encap.c cvs rdiff -u -r1.138 -r1.139 src/sys/netinet/ip_mroute.c cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/ip_reass.c \ src/sys/netinet/portalgo.c cvs rdiff -u -r1.156 -r1.157 src/sys/netinet/raw_ip.c cvs rdiff -u -r1.20 -r1.21 src/sys/netinet/tcp_congctl.c cvs rdiff -u -r1.29 -r1.30 src/sys/netinet/tcp_debug.c cvs rdiff -u -r1.89 -r1.90 src/sys/netinet/tcp_timer.c cvs rdiff -u -r1.211 -r1.212 src/sys/netinet/tcp_usrreq.c cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/tcp_vtw.c cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/tcp_vtw.h cvs rdiff -u -r1.224 -r1.225 src/sys/netinet/udp_usrreq.c cvs rdiff -u -r1.7 -r1.8 src/sys/netinet6/dccp6_usrreq.c cvs rdiff -u -r1.18 -r1.19 src/sys/netinet6/dest6.c cvs rdiff -u -r1.111 -r1.112 src/sys/netinet6/in6_proto.c cvs rdiff -u -r1.109 -r1.110 src/sys/netinet6/nd6_rtr.c cvs rdiff -u -r1.141 -r1.142 src/sys/netinet6/raw_ip6.c cvs rdiff -u -r1.11 -r1.12 src/sys/netinet6/scope6.c cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/udp6_usrreq.c cvs rdiff -u -r1.5 -r1.6 src/sys/netmpls/mpls_ttl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet/dccp_cc_sw.c diff -u src/sys/netinet/dccp_cc_sw.c:1.2 src/sys/netinet/dccp_cc_sw.c:1.3 --- src/sys/netinet/dccp_cc_sw.c:1.2 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/dccp_cc_sw.c Tue Apr 26 08:44:44 2016 @@ -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.2 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: dccp_cc_sw.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (c) 2003 Nils-Erik Mattsson @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dccp_cc_sw.c,v 1.2 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dccp_cc_sw.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_dccp.h" @@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_cc_sw.c #include <sys/queue.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/dccp_tcplike.c diff -u src/sys/netinet/dccp_tcplike.c:1.2 src/sys/netinet/dccp_tcplike.c:1.3 --- src/sys/netinet/dccp_tcplike.c:1.2 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/dccp_tcplike.c Tue Apr 26 08:44:44 2016 @@ -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.2 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: dccp_tcplike.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (c) 2003 Magnus Erixzon @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.2 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dccp_tcplike.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_dccp.h" @@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_tcplike #include <sys/syslog.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/dccp_tfrc.c diff -u src/sys/netinet/dccp_tfrc.c:1.2 src/sys/netinet/dccp_tfrc.c:1.3 --- src/sys/netinet/dccp_tfrc.c:1.2 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/dccp_tfrc.c Tue Apr 26 08:44:44 2016 @@ -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.2 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: dccp_tfrc.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (c) 2003 Nils-Erik Mattsson @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.2 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.3 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_dccp.h" @@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c, #include <sys/callout.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/igmp.c diff -u src/sys/netinet/igmp.c:1.56 src/sys/netinet/igmp.c:1.57 --- src/sys/netinet/igmp.c:1.56 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/igmp.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: igmp.c,v 1.56 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: igmp.c,v 1.57 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.56 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.57 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_mrouting.h" @@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.5 #include <sys/sysctl.h> #include <net/if.h> -#include <net/route.h> #include <net/net_stats.h> #include <netinet/in.h> Index: src/sys/netinet/in_pcb.h diff -u src/sys/netinet/in_pcb.h:1.59 src/sys/netinet/in_pcb.h:1.60 --- src/sys/netinet/in_pcb.h:1.59 Sun May 24 15:43:45 2015 +++ src/sys/netinet/in_pcb.h Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in_pcb.h,v 1.59 2015/05/24 15:43:45 rtr Exp $ */ +/* $NetBSD: in_pcb.h,v 1.60 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -64,6 +64,7 @@ #define _NETINET_IN_PCB_H_ #include <sys/queue.h> +#include <net/route.h> #include <netinet/in_pcb_hdr.h> /* Index: src/sys/netinet/in_proto.c diff -u src/sys/netinet/in_proto.c:1.119 src/sys/netinet/in_proto.c:1.120 --- src/sys/netinet/in_proto.c:1.119 Mon Apr 11 08:56:16 2016 +++ src/sys/netinet/in_proto.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in_proto.c,v 1.119 2016/04/11 08:56:16 ozaki-r Exp $ */ +/* $NetBSD: in_proto.c,v 1.120 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.119 2016/04/11 08:56:16 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.120 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_mrouting.h" @@ -81,7 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v #include <sys/mbuf.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/ip_encap.c diff -u src/sys/netinet/ip_encap.c:1.52 src/sys/netinet/ip_encap.c:1.53 --- src/sys/netinet/ip_encap.c:1.52 Fri Feb 26 07:35:17 2016 +++ src/sys/netinet/ip_encap.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_encap.c,v 1.52 2016/02/26 07:35:17 knakahara Exp $ */ +/* $NetBSD: ip_encap.c,v 1.53 2016/04/26 08:44:44 ozaki-r Exp $ */ /* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */ /* @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.52 2016/02/26 07:35:17 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.53 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_mrouting.h" @@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v #include <sys/kmem.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/ip_mroute.c diff -u src/sys/netinet/ip_mroute.c:1.138 src/sys/netinet/ip_mroute.c:1.139 --- src/sys/netinet/ip_mroute.c:1.138 Tue Jan 26 06:00:10 2016 +++ src/sys/netinet/ip_mroute.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_mroute.c,v 1.138 2016/01/26 06:00:10 knakahara Exp $ */ +/* $NetBSD: ip_mroute.c,v 1.139 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (c) 1992, 1993 @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.138 2016/01/26 06:00:10 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.139 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -120,7 +120,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_mroute.c, #include <sys/syslog.h> #include <net/if.h> -#include <net/route.h> #include <net/raw_cb.h> #include <netinet/in.h> Index: src/sys/netinet/ip_reass.c diff -u src/sys/netinet/ip_reass.c:1.9 src/sys/netinet/ip_reass.c:1.10 --- src/sys/netinet/ip_reass.c:1.9 Tue Feb 25 18:30:12 2014 +++ src/sys/netinet/ip_reass.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_reass.c,v 1.9 2014/02/25 18:30:12 pooka Exp $ */ +/* $NetBSD: ip_reass.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.9 2014/02/25 18:30:12 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v #include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/portalgo.c diff -u src/sys/netinet/portalgo.c:1.9 src/sys/netinet/portalgo.c:1.10 --- src/sys/netinet/portalgo.c:1.9 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/portalgo.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: portalgo.c,v 1.9 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: portalgo.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright 2011 Vlad Balan @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.9 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: portalgo.c,v #include <sys/bitops.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/raw_ip.c diff -u src/sys/netinet/raw_ip.c:1.156 src/sys/netinet/raw_ip.c:1.157 --- src/sys/netinet/raw_ip.c:1.156 Thu Jan 21 15:41:30 2016 +++ src/sys/netinet/raw_ip.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.156 2016/01/21 15:41:30 riastradh Exp $ */ +/* $NetBSD: raw_ip.c,v 1.157 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.156 2016/01/21 15:41:30 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.157 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1 #include <sys/kauth.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/tcp_congctl.c diff -u src/sys/netinet/tcp_congctl.c:1.20 src/sys/netinet/tcp_congctl.c:1.21 --- src/sys/netinet/tcp_congctl.c:1.20 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/tcp_congctl.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_congctl.c,v 1.20 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc. @@ -135,7 +135,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.20 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -158,7 +158,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl. #include <sys/mutex.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/tcp_debug.c diff -u src/sys/netinet/tcp_debug.c:1.29 src/sys/netinet/tcp_debug.c:1.30 --- src/sys/netinet/tcp_debug.c:1.29 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/tcp_debug.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_debug.c,v 1.29 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: tcp_debug.c,v 1.30 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.29 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.30 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_debug.c, #include <sys/protosw.h> #include <sys/errno.h> -#include <net/route.h> #include <net/if.h> #include <netinet/in.h> Index: src/sys/netinet/tcp_timer.c diff -u src/sys/netinet/tcp_timer.c:1.89 src/sys/netinet/tcp_timer.c:1.90 --- src/sys/netinet/tcp_timer.c:1.89 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/tcp_timer.c Tue Apr 26 08:44:44 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_timer.c,v 1.89 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: tcp_timer.c,v 1.90 2016/04/26 08:44:44 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.89 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.90 2016/04/26 08:44:44 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_timer.c, #include <sys/kernel.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/tcp_usrreq.c diff -u src/sys/netinet/tcp_usrreq.c:1.211 src/sys/netinet/tcp_usrreq.c:1.212 --- src/sys/netinet/tcp_usrreq.c:1.211 Mon Feb 15 14:59:03 2016 +++ src/sys/netinet/tcp_usrreq.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_usrreq.c,v 1.211 2016/02/15 14:59:03 rtr Exp $ */ +/* $NetBSD: tcp_usrreq.c,v 1.212 2016/04/26 08:44:45 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.211 2016/02/15 14:59:03 rtr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.212 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -125,7 +125,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c #include <sys/uidinfo.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet/tcp_vtw.c diff -u src/sys/netinet/tcp_vtw.c:1.14 src/sys/netinet/tcp_vtw.c:1.15 --- src/sys/netinet/tcp_vtw.c:1.14 Mon Aug 24 22:21:26 2015 +++ src/sys/netinet/tcp_vtw.c Tue Apr 26 08:44:45 2016 @@ -96,7 +96,6 @@ #include <sys/domain.h> #include <sys/kernel.h> #include <net/if.h> -#include <net/route.h> #include <net/if_types.h> #include <netinet/in.h> @@ -124,7 +123,7 @@ #include <netinet/tcp_vtw.h> -__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.14 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.15 2016/04/26 08:44:45 ozaki-r Exp $"); #define db_trace(__a, __b) do { } while (/*CONSTCOND*/0) Index: src/sys/netinet/tcp_vtw.h diff -u src/sys/netinet/tcp_vtw.h:1.6 src/sys/netinet/tcp_vtw.h:1.7 --- src/sys/netinet/tcp_vtw.h:1.6 Fri Nov 23 14:48:31 2012 +++ src/sys/netinet/tcp_vtw.h Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_vtw.h,v 1.6 2012/11/23 14:48:31 joerg Exp $ */ +/* $NetBSD: tcp_vtw.h,v 1.7 2016/04/26 08:44:45 ozaki-r Exp $ */ /* * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -126,7 +126,6 @@ #include <sys/socket.h> #include <sys/sysctl.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> Index: src/sys/netinet/udp_usrreq.c diff -u src/sys/netinet/udp_usrreq.c:1.224 src/sys/netinet/udp_usrreq.c:1.225 --- src/sys/netinet/udp_usrreq.c:1.224 Mon Feb 15 14:59:03 2016 +++ src/sys/netinet/udp_usrreq.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.224 2016/02/15 14:59:03 rtr Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.225 2016/04/26 08:44:45 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.224 2016/02/15 14:59:03 rtr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.225 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include <sys/sysctl.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet6/dccp6_usrreq.c diff -u src/sys/netinet6/dccp6_usrreq.c:1.7 src/sys/netinet6/dccp6_usrreq.c:1.8 --- src/sys/netinet6/dccp6_usrreq.c:1.7 Mon Aug 24 22:21:27 2015 +++ src/sys/netinet6/dccp6_usrreq.c Tue Apr 26 08:44:45 2016 @@ -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.7 2015/08/24 22:21:27 pooka Exp $ */ +/* $NetBSD: dccp6_usrreq.c,v 1.8 2016/04/26 08:44:45 ozaki-r Exp $ */ /* * Copyright (C) 2003 WIDE Project. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.7 2015/08/24 22:21:27 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.8 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq #include <sys/queue.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet6/dest6.c diff -u src/sys/netinet6/dest6.c:1.18 src/sys/netinet6/dest6.c:1.19 --- src/sys/netinet6/dest6.c:1.18 Fri Nov 14 17:34:23 2014 +++ src/sys/netinet6/dest6.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: dest6.c,v 1.18 2014/11/14 17:34:23 maxv Exp $ */ +/* $NetBSD: dest6.c,v 1.19 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.18 2014/11/14 17:34:23 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.19 2016/04/26 08:44:45 ozaki-r Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1. #include <sys/kernel.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> Index: src/sys/netinet6/in6_proto.c diff -u src/sys/netinet6/in6_proto.c:1.111 src/sys/netinet6/in6_proto.c:1.112 --- src/sys/netinet6/in6_proto.c:1.111 Mon Apr 11 08:56:16 2016 +++ src/sys/netinet6/in6_proto.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_proto.c,v 1.111 2016/04/11 08:56:16 ozaki-r Exp $ */ +/* $NetBSD: in6_proto.c,v 1.112 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.111 2016/04/11 08:56:16 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.112 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_gateway.h" @@ -80,7 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c, #include <sys/mbuf.h> #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h> Index: src/sys/netinet6/nd6_rtr.c diff -u src/sys/netinet6/nd6_rtr.c:1.109 src/sys/netinet6/nd6_rtr.c:1.110 --- src/sys/netinet6/nd6_rtr.c:1.109 Mon Apr 11 08:56:16 2016 +++ src/sys/netinet6/nd6_rtr.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nd6_rtr.c,v 1.109 2016/04/11 08:56:16 ozaki-r Exp $ */ +/* $NetBSD: nd6_rtr.c,v 1.110 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.109 2016/04/11 08:56:16 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.110 2016/04/26 08:44:45 ozaki-r Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v #include <net/if.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet6/in6_var.h> Index: src/sys/netinet6/raw_ip6.c diff -u src/sys/netinet6/raw_ip6.c:1.141 src/sys/netinet6/raw_ip6.c:1.142 --- src/sys/netinet6/raw_ip6.c:1.141 Mon Aug 24 22:21:27 2015 +++ src/sys/netinet6/raw_ip6.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip6.c,v 1.141 2015/08/24 22:21:27 pooka Exp $ */ +/* $NetBSD: raw_ip6.c,v 1.142 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.141 2015/08/24 22:21:27 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.142 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -80,7 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v #include <sys/kmem.h> #include <net/if.h> -#include <net/route.h> #include <net/if_types.h> #include <net/net_stats.h> Index: src/sys/netinet6/scope6.c diff -u src/sys/netinet6/scope6.c:1.11 src/sys/netinet6/scope6.c:1.12 --- src/sys/netinet6/scope6.c:1.11 Wed Dec 10 01:10:37 2014 +++ src/sys/netinet6/scope6.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: scope6.c,v 1.11 2014/12/10 01:10:37 christos Exp $ */ +/* $NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME$ */ /*- @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.11 2014/12/10 01:10:37 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1 #include <sys/queue.h> #include <sys/syslog.h> -#include <net/route.h> #include <net/if.h> #include <netinet/in.h> Index: src/sys/netinet6/udp6_usrreq.c diff -u src/sys/netinet6/udp6_usrreq.c:1.121 src/sys/netinet6/udp6_usrreq.c:1.122 --- src/sys/netinet6/udp6_usrreq.c:1.121 Mon Aug 24 22:21:27 2015 +++ src/sys/netinet6/udp6_usrreq.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: udp6_usrreq.c,v 1.121 2015/08/24 22:21:27 pooka Exp $ */ +/* $NetBSD: udp6_usrreq.c,v 1.122 2016/04/26 08:44:45 ozaki-r Exp $ */ /* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.121 2015/08/24 22:21:27 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.122 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp6_usrreq. #include <sys/sysctl.h> #include <net/if.h> -#include <net/route.h> #include <net/if_types.h> #include <netinet/in.h> Index: src/sys/netmpls/mpls_ttl.c diff -u src/sys/netmpls/mpls_ttl.c:1.5 src/sys/netmpls/mpls_ttl.c:1.6 --- src/sys/netmpls/mpls_ttl.c:1.5 Mon Aug 24 22:21:27 2015 +++ src/sys/netmpls/mpls_ttl.c Tue Apr 26 08:44:45 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: mpls_ttl.c,v 1.5 2015/08/24 22:21:27 pooka Exp $ */ +/* $NetBSD: mpls_ttl.c,v 1.6 2016/04/26 08:44:45 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -97,7 +97,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpls_ttl.c,v 1.5 2015/08/24 22:21:27 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpls_ttl.c,v 1.6 2016/04/26 08:44:45 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -113,7 +113,6 @@ __KERNEL_RCSID(0, "$NetBSD: mpls_ttl.c,v #include <net/if.h> #include <net/if_dl.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_systm.h>