From 3ca2e802d659d45e76516164bb577a8182fd54eb Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Tue, 22 Feb 2022 01:35:40 +0000
Subject: [PATCH] Delete unnecessary #includes of <netinet6/ip6protosw.h>: some
 never needed it and some no longer need it after moving the externs from
 there to <sys/protosw.h>

ok jsg@
---
 sys/netinet/ip_input.c     | 3 +--
 sys/netinet/ipsec_input.c  | 3 +--
 sys/netinet6/in6_proto.c   | 3 +--
 sys/netinet6/ip6_input.c   | 4 +---
 sys/netinet6/ip6_output.c  | 3 +--
 sys/netinet6/udp6_output.c | 3 +--
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index e9042d8e093..7e0ba1ee412 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.365 2022/01/25 04:04:40 gnezdo Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.366 2022/02/22 01:35:40 guenther Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -64,7 +64,6 @@
 #include <net/if_types.h>
 
 #ifdef INET6
-#include <netinet6/ip6protosw.h>
 #include <netinet6/ip6_var.h>
 #endif
 
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 93eafc62de3..353466af1f3 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_input.c,v 1.202 2022/01/04 06:32:39 yasuoka Exp $	*/
+/*	$OpenBSD: ipsec_input.c,v 1.203 2022/02/22 01:35:40 guenther Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -67,7 +67,6 @@
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/ip6protosw.h>
 #endif /* INET6 */
 
 #include <netinet/ip_ipsp.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index d9f57b627f3..7945b95a4b9 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_proto.c,v 1.106 2021/10/24 22:59:47 bluhm Exp $	*/
+/*	$OpenBSD: in6_proto.c,v 1.107 2022/02/22 01:35:41 guenther Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -93,7 +93,6 @@
 
 #include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
-#include <netinet6/ip6protosw.h>
 
 #include "gif.h"
 #if NGIF > 0
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 07abb449632..fa20f0685ea 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.239 2022/01/02 22:36:04 jsg Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.240 2022/02/22 01:35:41 guenther Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -98,8 +98,6 @@
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
 
-#include <netinet6/ip6protosw.h>
-
 #include "gif.h"
 #include "bpfilter.h"
 
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index f9bfa9b5000..1fa8996a534 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.267 2022/01/04 06:32:40 yasuoka Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.268 2022/02/22 01:35:41 guenther Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -94,7 +94,6 @@
 #include <netinet/icmp6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
-#include <netinet6/ip6protosw.h>
 
 #include <crypto/idgen.h>
 
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 30755812ba7..0920133863e 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp6_output.c,v 1.58 2022/02/22 01:15:02 guenther Exp $	*/
+/*	$OpenBSD: udp6_output.c,v 1.59 2022/02/22 01:35:41 guenther Exp $	*/
 /*	$KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $	*/
 
 /*
@@ -87,7 +87,6 @@
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
-#include <netinet6/ip6protosw.h>
 
 /*
  * UDP protocol implementation.
-- 
2.20.1