[src/trunk]: src/sys Sweep unnecessary route.h inclusions

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8826f83ac1a5
branches:  trunk
changeset: 815021:8826f83ac1a5
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Apr 26 08:44:44 2016 +0000

description:
Sweep unnecessary route.h inclusions

diffstat:

 sys/netinet/dccp_cc_sw.c    |  5 ++---
 sys/netinet/dccp_tcplike.c  |  5 ++---
 sys/netinet/dccp_tfrc.c     |  5 ++---
 sys/netinet/igmp.c          |  5 ++---
 sys/netinet/in_pcb.h        |  3 ++-
 sys/netinet/in_proto.c      |  5 ++---
 sys/netinet/ip_encap.c      |  5 ++---
 sys/netinet/ip_mroute.c     |  5 ++---
 sys/netinet/ip_reass.c      |  5 ++---
 sys/netinet/portalgo.c      |  5 ++---
 sys/netinet/raw_ip.c        |  5 ++---
 sys/netinet/tcp_congctl.c   |  5 ++---
 sys/netinet/tcp_debug.c     |  5 ++---
 sys/netinet/tcp_timer.c     |  5 ++---
 sys/netinet/tcp_usrreq.c    |  5 ++---
 sys/netinet/tcp_vtw.c       |  3 +--
 sys/netinet/tcp_vtw.h       |  3 +--
 sys/netinet/udp_usrreq.c    |  5 ++---
 sys/netinet6/dccp6_usrreq.c |  5 ++---
 sys/netinet6/dest6.c        |  5 ++---
 sys/netinet6/in6_proto.c    |  5 ++---
 sys/netinet6/nd6_rtr.c      |  5 ++---
 sys/netinet6/raw_ip6.c      |  5 ++---
 sys/netinet6/scope6.c       |  5 ++---
 sys/netinet6/udp6_usrreq.c  |  5 ++---
 sys/netmpls/mpls_ttl.c      |  5 ++---
 26 files changed, 50 insertions(+), 74 deletions(-)

diffs (truncated from 656 to 300 lines):

diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/dccp_cc_sw.c
--- a/sys/netinet/dccp_cc_sw.c  Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/dccp_cc_sw.c  Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/dccp_tcplike.c
--- a/sys/netinet/dccp_tcplike.c        Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/dccp_tcplike.c        Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/dccp_tfrc.c
--- a/sys/netinet/dccp_tfrc.c   Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/dccp_tfrc.c   Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/callout.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/igmp.c
--- a/sys/netinet/igmp.c        Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/igmp.c        Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/net_stats.h>
 
 #include <netinet/in.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/in_pcb.h
--- a/sys/netinet/in_pcb.h      Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/in_pcb.h      Tue Apr 26 08:44:44 2016 +0000
@@ -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>
 
 /*
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/in_proto.c
--- a/sys/netinet/in_proto.c    Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/in_proto.c    Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/mbuf.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/ip_encap.c    Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/kmem.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/ip_mroute.c   Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/raw_cb.h>
 
 #include <netinet/in.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/ip_reass.c
--- a/sys/netinet/ip_reass.c    Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/ip_reass.c    Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/portalgo.c
--- a/sys/netinet/portalgo.c    Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/portalgo.c    Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/bitops.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/raw_ip.c      Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/kauth.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff -r b66c8eac4d2e -r 8826f83ac1a5 sys/netinet/tcp_congctl.c
--- a/sys/netinet/tcp_congctl.c Tue Apr 26 05:18:22 2016 +0000
+++ b/sys/netinet/tcp_congctl.c Tue Apr 26 08:44:44 2016 +0000
@@ -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 @@
 #include <sys/mutex.h>