Fewer <netinet/in_systm.h> !

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index f3405cd..27487c0 100644 (file)
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kern_sysctl.c,v 1.259 2014/07/17 13:44:21 tedu Exp $  */
+/*     $OpenBSD: kern_sysctl.c,v 1.260 2014/07/22 11:06:09 mpi Exp $   */
 /*     $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $     */
 
 /*-
@@ -83,7 +83,6 @@
 
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip6.h>

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 2031276..b506ce9 100644 (file)
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bridgestp.c,v 1.48 2014/07/12 18:44:22 tedu Exp $     */
+/*     $OpenBSD: bridgestp.c,v 1.49 2014/07/22 11:06:09 mpi Exp $      */
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -55,7 +55,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif

diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 756aac0..10c8d13 100644 (file)
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_bridge.c,v 1.225 2014/07/12 18:44:22 tedu Exp $    */
+/*     $OpenBSD: if_bridge.c,v 1.226 2014/07/22 11:06:09 mpi Exp $     */
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -57,7 +57,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_ether.h>

diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index f008258..ad0f6d1 100644 (file)
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_gif.c,v 1.68 2014/07/12 18:44:22 tedu Exp $        */
+/*     $OpenBSD: if_gif.c,v 1.69 2014/07/22 11:06:09 mpi Exp $ */
 /*     $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */
 
 /*
@@ -45,7 +45,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/in_gif.h>
 #include <netinet/ip.h>

diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 9fc289d..7eb3ab4 100644 (file)
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.69 2014/07/12 18:44:22 tedu Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.70 2014/07/22 11:06:09 mpi Exp $ */
 /*     $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -59,7 +59,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_ether.h>

diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 75af904..1e9172c 100644 (file)
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_loop.c,v 1.56 2014/07/12 18:44:22 tedu Exp $       */
+/*     $OpenBSD: if_loop.c,v 1.57 2014/07/22 11:06:09 mpi Exp $        */
 /*     $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $     */
 
 /*
@@ -124,7 +124,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 

diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 0c708de..74039dc 100644 (file)
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.34 2014/07/12 18:44:22 tedu Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.35 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -31,7 +31,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 

diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index 7a597e8..d992b95 100644 (file)
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_pflog.c,v 1.61 2014/07/12 18:44:22 tedu Exp $      */
+/*     $OpenBSD: if_pflog.c,v 1.62 2014/07/22 11:06:09 mpi Exp $       */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -51,7 +51,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>

diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index b3ad4be..df62535 100644 (file)
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_pflow.c,v 1.44 2014/07/12 18:44:22 tedu Exp $      */
+/*     $OpenBSD: if_pflow.c,v 1.45 2014/07/22 11:06:09 mpi Exp $       */
 
 /*
  * Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -41,7 +41,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>

diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 365b81c..e30e29c 100644 (file)
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_pfsync.c,v 1.207 2014/07/12 18:44:22 tedu Exp $    */
+/*     $OpenBSD: if_pfsync.c,v 1.208 2014/07/22 11:06:09 mpi Exp $     */
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -66,7 +66,6 @@
 #include <netinet/tcp_seq.h>
 
 #ifdef INET
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index cff0149..8cad602 100644 (file)
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_ppp.c,v 1.75 2014/07/12 18:44:22 tedu Exp $        */
+/*     $OpenBSD: if_ppp.c,v 1.76 2014/07/22 11:06:09 mpi Exp $ */
 /*     $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $     */
 
 /*
@@ -127,7 +127,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #else
 #ifdef _KERNEL

diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 3e71ec6..9c1160d 100644 (file)
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_pppx.c,v 1.31 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: if_pppx.c,v 1.32 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -70,7 +70,6 @@
 #include <net/if_dl.h>
 
 #ifdef INET
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 052124f..f037255 100644 (file)
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_sl.c,v 1.52 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: if_sl.c,v 1.53 2014/07/22 11:06:09 mpi Exp $  */
 /*     $NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $   */
 
 /*
@@ -81,7 +81,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #else
 #error Huh? Slip without inet?

diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index d3ff56a..222475e 100644 (file)
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_spppsubr.c,v 1.124 2014/07/12 18:44:22 tedu Exp $  */
+/*     $OpenBSD: if_spppsubr.c,v 1.125 2014/07/22 11:06:09 mpi Exp $   */
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -60,7 +60,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index aadf2d7..b9f19b3 100644 (file)
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_trunk.c,v 1.89 2014/07/12 18:44:22 tedu Exp $      */
+/*     $OpenBSD: if_trunk.c,v 1.90 2014/07/22 11:06:09 mpi Exp $       */
 
 /*
  * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -43,7 +43,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #endif

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 9f62d5b..2742c2e 100644 (file)
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_tun.c,v 1.126 2014/07/12 18:44:22 tedu Exp $       */
+/*     $OpenBSD: if_tun.c,v 1.127 2014/07/22 11:06:09 mpi Exp $        */
 /*     $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $      */
 
 /*
@@ -64,7 +64,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif

diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
index 5adc84b..3e676c8 100644 (file)
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vxlan.c,v 1.14 2014/07/12 18:44:22 tedu Exp $      */
+/*     $OpenBSD: if_vxlan.c,v 1.15 2014/07/22 11:06:09 mpi Exp $       */
 
 /*
  * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org>
@@ -44,7 +44,6 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

diff --git a/sys/net/pf.c b/sys/net/pf.c
index 247d6c6..a5d9aad 100644 (file)
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf.c,v 1.882 2014/07/13 16:58:43 bluhm Exp $ */
+/*     $OpenBSD: pf.c,v 1.883 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -62,7 +62,6 @@
 #include <net/radix_mpath.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>

diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 638cccf..f6edb53 100644 (file)
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_if.c,v 1.73 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: pf_if.c,v 1.74 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -48,7 +48,6 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 

diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 56330d9..735ff7d 100644 (file)
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_ioctl.c,v 1.273 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: pf_ioctl.c,v 1.274 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -60,7 +60,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>

diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index 0dda255..fd862ce 100644 (file)
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_lb.c,v 1.31 2014/07/02 13:06:00 mikeb Exp $ */
+/*     $OpenBSD: pf_lb.c,v 1.32 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -62,7 +62,6 @@
 #include <net/radix_mpath.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>

diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 0601fe2..6913db3 100644 (file)
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_norm.c,v 1.166 2014/07/13 17:41:04 bluhm Exp $ */
+/*     $OpenBSD: pf_norm.c,v 1.167 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -48,7 +48,6 @@
 #include <net/if_pflog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>

diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index 7fbec60..366452b 100644 (file)
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_osfp.c,v 1.28 2013/11/11 09:15:34 mpi Exp $ */
+/*     $OpenBSD: pf_osfp.c,v 1.29 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -27,7 +27,6 @@
 #include <sys/syslog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 

diff --git a/sys/net/pf_ruleset.c b/sys/net/pf_ruleset.c
index bca6acf..d8abc40 100644 (file)
--- a/sys/net/pf_ruleset.c
+++ b/sys/net/pf_ruleset.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_ruleset.c,v 1.8 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: pf_ruleset.c,v 1.9 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -44,7 +44,6 @@
 #include <sys/syslog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 

diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index dfd5cb3..657cd96 100644 (file)
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pipex.c,v 1.54 2014/07/12 18:44:22 tedu Exp $ */
+/*     $OpenBSD: pipex.c,v 1.55 2014/07/22 11:06:10 mpi Exp $  */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -64,7 +64,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #ifdef INET6

diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 54cc076..30c3bc5 100644 (file)
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ppp_tty.c,v 1.27 2014/04/19 12:18:35 henning Exp $    */
+/*     $OpenBSD: ppp_tty.c,v 1.28 2014/07/22 11:06:10 mpi Exp $        */
 /*     $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $    */
 
 /*
@@ -117,7 +117,6 @@
 
 #ifdef VJC
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/slcompress.h>
 #endif

diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 7b6e73e..bd98b87 100644 (file)
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: slcompress.c,v 1.10 2013/06/11 18:15:53 deraadt Exp $ */
+/*     $OpenBSD: slcompress.c,v 1.11 2014/07/22 11:06:10 mpi Exp $     */
 /*     $NetBSD: slcompress.c,v 1.17 1997/05/17 21:12:10 christos Exp $ */
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 

diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 31c5940..aaa023d 100644 (file)
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_output.c,v 1.90 2014/03/19 10:09:19 mpi Exp $       */
+/*     $OpenBSD: ieee80211_output.c,v 1.91 2014/07/22 11:06:10 mpi Exp $       */
 /*     $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $     */
 
 /*-
@@ -54,7 +54,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #ifdef INET6
 #include <netinet/ip6.h>

diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c
index 3dfcbce..7385ac5 100644 (file)
--- a/sys/net80211/ieee80211_pae_input.c
+++ b/sys/net80211/ieee80211_pae_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_pae_input.c,v 1.18 2011/05/04 16:05:49 blambert Exp $       */
+/*     $OpenBSD: ieee80211_pae_input.c,v 1.19 2014/07/22 11:06:10 mpi Exp $    */
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -39,7 +39,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #endif
 
 #include <net80211/ieee80211_var.h>

diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index 423d38a..c5c7c5c 100644 (file)
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ieee80211_pae_output.c,v 1.16 2010/06/05 15:54:35 damien Exp $        */
+/*     $OpenBSD: ieee80211_pae_output.c,v 1.17 2014/07/22 11:06:10 mpi Exp $   */
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,7 +42,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index a112ef2..038b43b 100644 (file)
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: igmp.c,v 1.42 2014/07/12 18:44:23 tedu Exp $  */
+/*     $OpenBSD: igmp.c,v 1.43 2014/07/22 11:06:10 mpi Exp $   */
 /*     $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $       */
 
 /*
@@ -89,7 +89,6 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/igmp.h>

diff --git a/sys/netinet/in4_cksum.c b/sys/netinet/in4_cksum.c
index b3bf4ff..a002643 100644 (file)
--- a/sys/netinet/in4_cksum.c
+++ b/sys/netinet/in4_cksum.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in4_cksum.c,v 1.8 2011/07/05 21:40:38 dhill Exp $     */
+/*     $OpenBSD: in4_cksum.c,v 1.9 2014/07/22 11:06:10 mpi Exp $       */
 /*     $KAME: in4_cksum.c,v 1.10 2001/11/30 10:06:15 itojun Exp $      */
 /*     $NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $   */
 
@@ -68,7 +68,6 @@
 #include <sys/socket.h>
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 

diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 9e3e181..5411be6 100644 (file)
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in_gif.c,v 1.40 2014/04/14 09:06:42 mpi Exp $ */
+/*     $OpenBSD: in_gif.c,v 1.41 2014/07/22 11:06:10 mpi Exp $ */
 /*     $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */
 
 /*
@@ -42,7 +42,6 @@
 #include <net/if_gif.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_gif.h>

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 24305d9..ed3115e 100644 (file)
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in_pcb.c,v 1.157 2014/07/12 21:06:34 yasuoka Exp $    */
+/*     $OpenBSD: in_pcb.c,v 1.158 2014/07/22 11:06:10 mpi Exp $        */
 /*     $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $     */
 
 /*
@@ -85,7 +85,6 @@
 #include <net/pfvar.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>

diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index f9bd021..3b08374 100644 (file)
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in_proto.c,v 1.60 2013/12/17 02:41:07 matthew Exp $   */
+/*     $OpenBSD: in_proto.c,v 1.61 2014/07/22 11:06:10 mpi Exp $       */
 /*     $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $   */
 
 /*
@@ -111,7 +111,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>

diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index 296a689..edba2e2 100644 (file)
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ah.c,v 1.110 2014/07/12 18:44:23 tedu Exp $ */
+/*     $OpenBSD: ip_ah.c,v 1.111 2014/07/22 11:06:10 mpi Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -48,7 +48,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #endif /* INET */

diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 481fa36..ad30cee 100644 (file)
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_carp.c,v 1.232 2014/07/12 18:44:23 tedu Exp $      */
+/*     $OpenBSD: ip_carp.c,v 1.233 2014/07/22 11:06:10 mpi Exp $       */
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -61,7 +61,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 3c24d14..83ebbf5 100644 (file)
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_divert.c,v 1.26 2014/07/12 19:05:45 lteo Exp $ */
+/*      $OpenBSD: ip_divert.c,v 1.27 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -30,7 +30,6 @@
 #include <net/pfvar.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 1c08f95..aed51e0 100644 (file)
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ecn.c,v 1.5 2012/03/15 16:37:11 markus Exp $       */
+/*     $OpenBSD: ip_ecn.c,v 1.6 2014/07/22 11:06:10 mpi Exp $  */
 /*     $KAME: ip_ecn.c,v 1.9 2000/10/01 12:44:48 itojun Exp $  */
 
 /*
@@ -41,7 +41,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 

diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 62c53ff..996759a 100644 (file)
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_esp.c,v 1.125 2014/07/12 18:44:23 tedu Exp $ */
+/*     $OpenBSD: ip_esp.c,v 1.126 2014/07/22 11:06:10 mpi Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -49,7 +49,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #endif /* INET */

diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index ab2778b..90c9cfb 100644 (file)
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ether.c,v 1.67 2014/07/14 12:18:30 deraadt Exp $  */
+/*     $OpenBSD: ip_ether.c,v 1.68 2014/07/22 11:06:10 mpi Exp $  */
 /*
  * The author of this code is Angelos D. Keromytis (kermit@adk.gr)
  *
@@ -43,7 +43,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 1c6c464..e627d92 100644 (file)
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_gre.c,v 1.49 2014/04/14 09:06:42 mpi Exp $ */
+/*      $OpenBSD: ip_gre.c,v 1.50 2014/07/22 11:06:10 mpi Exp $ */
 /*     $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -55,7 +55,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_gre.h>

diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c
index 021ff99..117bc60 100644 (file)
--- a/sys/netinet/ip_ipcomp.c
+++ b/sys/netinet/ip_ipcomp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.c,v 1.35 2014/07/12 18:44:23 tedu Exp $ */
+/* $OpenBSD: ip_ipcomp.c,v 1.36 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -41,7 +41,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #endif                         /* INET */

diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index 9f67b26..a9be55a 100644 (file)
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ipip.c,v 1.52 2014/04/14 09:06:42 mpi Exp $ */
+/*     $OpenBSD: ip_ipip.c,v 1.53 2014/07/22 11:06:10 mpi Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -54,7 +54,6 @@
 #include <net/bpf.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 526d2e6..e4a5df8 100644 (file)
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ipsp.c,v 1.196 2014/07/12 18:44:23 tedu Exp $      */
+/*     $OpenBSD: ip_ipsp.c,v 1.197 2014/07/22 11:06:10 mpi Exp $       */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -61,7 +61,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index f2583c9..37bd655 100644 (file)
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_mroute.c,v 1.67 2014/07/12 18:44:23 tedu Exp $     */
+/*     $OpenBSD: ip_mroute.c,v 1.68 2014/07/22 11:06:10 mpi Exp $      */
 /*     $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $      */
 
 /*
@@ -79,7 +79,6 @@
 #include <net/raw_cb.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index eb7db87..cfe4ef4 100644 (file)
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_output.c,v 1.265 2014/07/12 18:44:23 tedu Exp $    */
+/*     $OpenBSD: ip_output.c,v 1.266 2014/07/22 11:06:10 mpi Exp $     */
 /*     $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $  */
 
 /*
@@ -48,7 +48,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>

diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 4962177..dddb6dc 100644 (file)
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.71 2014/04/14 09:06:42 mpi Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.72 2014/07/22 11:06:10 mpi Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -36,7 +36,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 6b1eb7e..8bde592 100644 (file)
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ipsec_input.c,v 1.121 2014/07/09 09:30:49 henning Exp $       */
+/*     $OpenBSD: ipsec_input.c,v 1.122 2014/07/22 11:06:10 mpi Exp $   */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -56,7 +56,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>

diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index ca1c1bf..adcab7d 100644 (file)
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ipsec_output.c,v 1.52 2014/04/21 12:22:26 henning Exp $ */
+/*     $OpenBSD: ipsec_output.c,v 1.53 2014/07/22 11:06:10 mpi Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -38,7 +38,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index c2ae755..60cd29e 100644 (file)
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: raw_ip.c,v 1.73 2014/06/02 10:41:40 mpi Exp $ */
+/*     $OpenBSD: raw_ip.c,v 1.74 2014/07/22 11:06:10 mpi Exp $ */
 /*     $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $     */
 
 /*
@@ -80,7 +80,6 @@
 #include <net/pfvar.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_mroute.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index ade7bde..cf74f09 100644 (file)
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcp_input.c,v 1.277 2014/07/11 13:15:34 bluhm Exp $   */
+/*     $OpenBSD: tcp_input.c,v 1.278 2014/07/22 11:06:10 mpi Exp $     */
 /*     $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $  */
 
 /*
@@ -86,7 +86,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 21eb847..1d38d06 100644 (file)
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcp_output.c,v 1.106 2014/04/21 12:22:26 henning Exp $        */
+/*     $OpenBSD: tcp_output.c,v 1.107 2014/07/22 11:06:10 mpi Exp $    */
 /*     $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $      */
 
 /*
@@ -82,7 +82,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 72ea22b..312e42b 100644 (file)
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcp_subr.c,v 1.131 2014/07/12 21:06:34 yasuoka Exp $  */
+/*     $OpenBSD: tcp_subr.c,v 1.132 2014/07/22 11:06:10 mpi Exp $      */
 /*     $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $   */
 
 /*
@@ -82,7 +82,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 9484143..2a71101 100644 (file)
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcp_timer.c,v 1.47 2013/08/08 14:29:29 mpi Exp $      */
+/*     $OpenBSD: tcp_timer.c,v 1.48 2014/07/22 11:06:10 mpi Exp $      */
 /*     $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $  */
 
 /*
@@ -44,7 +44,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index e674a51..2cb2c8a 100644 (file)
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcp_usrreq.c,v 1.118 2014/04/06 16:49:40 chrisz Exp $ */
+/*     $OpenBSD: tcp_usrreq.c,v 1.119 2014/07/22 11:06:10 mpi Exp $    */
 /*     $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */
 
 /*
@@ -87,7 +87,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 162f7be..90914a5 100644 (file)
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: udp_usrreq.c,v 1.188 2014/07/12 21:06:34 yasuoka Exp $        */
+/*     $OpenBSD: udp_usrreq.c,v 1.189 2014/07/22 11:06:10 mpi Exp $    */
 /*     $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
 
 /*
@@ -82,7 +82,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 049147a..dd8950a 100644 (file)
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: frag6.c,v 1.53 2014/07/12 18:44:23 tedu Exp $ */
+/*     $OpenBSD: frag6.c,v 1.54 2014/07/22 11:06:10 mpi Exp $  */
 /*     $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $  */
 
 /*
@@ -50,7 +50,6 @@
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
-#include <netinet/in_systm.h>  /* for ECN definitions */
 #include <netinet/ip.h>                /* for ECN definitions */
 
 #include <dev/rndvar.h>

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 517271c..07b9a7b 100644 (file)
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: icmp6.c,v 1.146 2014/07/11 12:20:26 benno Exp $       */
+/*     $OpenBSD: icmp6.c,v 1.147 2014/07/22 11:06:10 mpi Exp $ */
 /*     $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
 
 /*
@@ -83,7 +83,6 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>

diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index b3ca430..4541b17 100644 (file)
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in6_gif.c,v 1.31 2013/05/31 15:04:23 bluhm Exp $      */
+/*     $OpenBSD: in6_gif.c,v 1.32 2014/07/22 11:06:10 mpi Exp $        */
 /*     $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $        */
 
 /*
@@ -49,7 +49,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip_ipsp.h>
 
 #ifdef INET

diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 771a126..e24719e 100644 (file)
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in6_pcb.c,v 1.63 2014/06/03 13:32:24 mpi Exp $        */
+/*     $OpenBSD: in6_pcb.c,v 1.64 2014/07/22 11:06:10 mpi Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -113,7 +113,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>

diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 3377ada..e81cdf6 100644 (file)
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in6_proto.c,v 1.72 2014/07/11 16:39:06 henning Exp $  */
+/*     $OpenBSD: in6_proto.c,v 1.73 2014/07/22 11:06:10 mpi Exp $      */
 /*     $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $      */
 
 /*
@@ -76,7 +76,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index fefcfd1..6df0f49 100644 (file)
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in6_src.c,v 1.44 2014/06/03 13:32:24 mpi Exp $        */
+/*     $OpenBSD: in6_src.c,v 1.45 2014/07/22 11:06:10 mpi Exp $        */
 /*     $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $        */
 
 /*
@@ -75,7 +75,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_var.h>

diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c
index a718218..b817eb4 100644 (file)
--- a/sys/netinet6/ip6_divert.c
+++ b/sys/netinet6/ip6_divert.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip6_divert.c,v 1.27 2014/07/12 19:05:45 lteo Exp $ */
+/*      $OpenBSD: ip6_divert.c,v 1.28 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -30,7 +30,6 @@
 #include <net/pfvar.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 160c083..60e67fc 100644 (file)
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip6_input.c,v 1.127 2014/07/08 17:19:26 deraadt Exp $ */
+/*     $OpenBSD: ip6_input.c,v 1.128 2014/07/22 11:06:10 mpi Exp $     */
 /*     $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $     */
 
 /*
@@ -85,7 +85,6 @@
 #include <net/netisr.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #ifdef INET
 #include <netinet/ip.h>

diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 70d28f0..ffa8be1 100644 (file)
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip6_output.c,v 1.157 2014/07/12 18:44:23 tedu Exp $   */
+/*     $OpenBSD: ip6_output.c,v 1.158 2014/07/22 11:06:10 mpi Exp $    */
 /*     $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $    */
 
 /*
@@ -78,7 +78,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/udp.h>

diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index a8198f7..1bfe5d1 100644 (file)
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: raw_ip6.c,v 1.67 2014/07/12 18:44:23 tedu Exp $       */
+/*     $OpenBSD: raw_ip6.c,v 1.68 2014/07/22 11:06:10 mpi Exp $        */
 /*     $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $        */
 
 /*
@@ -88,7 +88,6 @@
 #include <netinet6/ip6_mroute.h>
 #endif
 #include <netinet/icmp6.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/nd6.h>

diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 9f4bc4b..21b5f2a 100644 (file)
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: udp6_output.c,v 1.30 2014/06/03 13:32:24 mpi Exp $    */
+/*     $OpenBSD: udp6_output.c,v 1.31 2014/07/22 11:06:10 mpi Exp $    */
 /*     $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $    */
 
 /*
@@ -75,7 +75,6 @@
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>

diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index 46ca07e..768de85 100644 (file)
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mpls_input.c,v 1.37 2013/10/24 11:31:43 mpi Exp $     */
+/*     $OpenBSD: mpls_input.c,v 1.38 2014/07/22 11:06:10 mpi Exp $     */
 
 /*
  * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -30,7 +30,6 @@
 
 #ifdef  INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>

diff --git a/sys/netmpls/mpls_output.c b/sys/netmpls/mpls_output.c
index 21d90d4..ec85049 100644 (file)
--- a/sys/netmpls/mpls_output.c
+++ b/sys/netmpls/mpls_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_output.c,v 1.16 2013/04/24 10:20:15 mpi Exp $ */
+/* $OpenBSD: mpls_output.c,v 1.17 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -29,7 +29,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif