From 940d25ac4b051a2393403748a2824064e1cac0c7 Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Sun, 11 Feb 2024 01:27:45 +0000
Subject: [PATCH] Remove include netinet6/ip6_var.h from netinet/in_pcb.h.

OK mvs@
---
 sys/netinet/in_pcb.c       | 3 ++-
 sys/netinet/in_pcb.h       | 3 +--
 sys/netinet/ip_ipip.c      | 3 ++-
 sys/netinet/ipsec_output.c | 3 ++-
 sys/netinet/tcp_input.c    | 3 ++-
 sys/netinet/tcp_output.c   | 3 ++-
 sys/netinet/tcp_subr.c     | 3 ++-
 sys/netinet/tcp_usrreq.c   | 3 ++-
 sys/netinet6/in6_pcb.c     | 3 ++-
 sys/netinet6/ip6_divert.c  | 3 ++-
 10 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 2acf37e1b7b..4a600b71774 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.291 2024/02/09 14:02:11 bluhm Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.292 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -90,6 +90,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/in_pcb.h>
 #ifdef IPSEC
 #include <netinet/ip_esp.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index fd09f3696aa..6b79f014a65 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.h,v 1.150 2024/01/31 12:27:57 bluhm Exp $	*/
+/*	$OpenBSD: in_pcb.h,v 1.151 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $	*/
 
 /*
@@ -69,7 +69,6 @@
 #include <sys/rwlock.h>
 #include <sys/refcnt.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet/ip_ipsp.h>
 
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index 86e4c0d0c91..84e9912f0c6 100644
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipip.c,v 1.100 2023/11/28 13:23:20 bluhm Exp $ */
+/*	$OpenBSD: ip_ipip.c,v 1.101 2024/02/11 01:27:45 bluhm Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -60,6 +60,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/ip_ecn.h>
 #include <netinet/ip_ipip.h>
 
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index ed18cfe74e2..51211348a82 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_output.c,v 1.97 2022/01/02 22:36:04 jsg Exp $ */
+/*	$OpenBSD: ipsec_output.c,v 1.98 2024/02/11 01:27:45 bluhm Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -36,6 +36,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 
 #if NPF > 0
 #include <net/pfvar.h>
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 75aa39d2a8d..ec593cc2853 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.399 2024/01/27 21:13:46 bluhm Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.400 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -88,6 +88,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 80d1956839f..c89b3a8cf8f 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_output.c,v 1.141 2023/11/26 22:08:10 bluhm Exp $	*/
+/*	$OpenBSD: tcp_output.c,v 1.142 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $	*/
 
 /*
@@ -90,6 +90,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/tcp.h>
 #define	TCPOUTFLAGS
 #include <netinet/tcp_fsm.h>
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index f7616f4da08..0fa13da4b49 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.197 2024/01/28 20:34:25 bluhm Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.198 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -85,6 +85,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index e61d87ab187..48c694a0f09 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.229 2024/01/19 02:24:07 bluhm Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.230 2024/02/11 01:27:45 bluhm Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -90,6 +90,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index ab7acb7d766..caa902a11f8 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_pcb.c,v 1.136 2024/02/09 14:02:12 bluhm Exp $	*/
+/*	$OpenBSD: in6_pcb.c,v 1.137 2024/02/11 01:27:45 bluhm Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -116,6 +116,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
+#include <netinet6/ip6_var.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 551df0e5012..4b75c3c2adf 100644
--- a/sys/netinet6/ip6_divert.c
+++ b/sys/netinet6/ip6_divert.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip6_divert.c,v 1.92 2024/02/03 22:50:09 mvs Exp $ */
+/*      $OpenBSD: ip6_divert.c,v 1.93 2024/02/11 01:27:45 bluhm Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -35,6 +35,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_divert.h>
 #include <netinet/ip6.h>
+#include <netinet6/ip6_var.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_divert.h>
 #include <netinet/tcp.h>
-- 
2.20.1