[src/trunk]: src/sys/netipsec Remove unnecessary inclusion of <net/netisr.h>.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7417e62840b4
branches:  trunk
changeset: 369827:7417e62840b4
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 02 23:48:10 2022 +0000

description:
Remove unnecessary inclusion of <net/netisr.h>.

diffstat:

 sys/arch/hppa/hppa/trap.c              |   6 ++----
 sys/arch/sun68k/sun68k/isr.c           |   6 ++----
 sys/arch/vax/vax/intvec.S              |   3 +--
 sys/arch/xen/xen/xennetback_xenbus.c   |   5 ++---
 sys/dev/pci/if_jme.c                   |  10 +++++++---
 sys/dev/pci/if_tl.c                    |   5 ++---
 sys/dev/ppbus/if_plip.c                |   5 ++---
 sys/dev/qbus/if_qt.c                   |   5 ++---
 sys/dev/sbus/be.c                      |   5 ++---
 sys/dev/sbus/qe.c                      |   5 ++---
 sys/external/bsd/ipf/netinet/ip_auth.c |   5 ++---
 sys/net/raw_usrreq.c                   |   5 ++---
 sys/netinet/ip_carp.c                  |   5 ++---
 sys/netipsec/ipsec_netbsd.c            |   5 ++---
 14 files changed, 32 insertions(+), 43 deletions(-)

diffs (truncated from 375 to 300 lines):

diff -r ac773d53c11b -r 7417e62840b4 sys/arch/hppa/hppa/trap.c
--- a/sys/arch/hppa/hppa/trap.c Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/arch/hppa/hppa/trap.c Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.120 2022/06/09 16:45:38 skrll Exp $ */
+/*     $NetBSD: trap.c,v 1.121 2022/09/02 23:48:10 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.120 2022/06/09 16:45:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121 2022/09/02 23:48:10 thorpej Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -83,8 +83,6 @@
 #include <sys/kmem.h>
 #include <sys/userret.h>
 
-#include <net/netisr.h>
-
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
diff -r ac773d53c11b -r 7417e62840b4 sys/arch/sun68k/sun68k/isr.c
--- a/sys/arch/sun68k/sun68k/isr.c      Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/arch/sun68k/sun68k/isr.c      Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isr.c,v 1.26 2020/11/21 00:27:52 thorpej Exp $ */
+/*     $NetBSD: isr.c,v 1.27 2022/09/02 23:48:10 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.26 2020/11/21 00:27:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.27 2022/09/02 23:48:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
-
 #include <machine/autoconf.h>
 #include <machine/mon.h>
 
diff -r ac773d53c11b -r 7417e62840b4 sys/arch/vax/vax/intvec.S
--- a/sys/arch/vax/vax/intvec.S Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/arch/vax/vax/intvec.S Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intvec.S,v 1.22 2017/05/22 16:46:15 ragge Exp $   */
+/*     $NetBSD: intvec.S,v 1.23 2022/09/02 23:48:10 thorpej Exp $   */
 
 /*
  * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@@ -28,7 +28,6 @@
 
 #include "assym.h"
 #include <sys/cdefs.h>
-#include <net/netisr.h>
 
 #include "opt_ddb.h"
 #include "opt_cputype.h"
diff -r ac773d53c11b -r 7417e62840b4 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.107 2022/09/01 15:33:23 bouyer Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.108 2022/09/02 23:48:10 thorpej Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.107 2022/09/01 15:33:23 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.108 2022/09/02 23:48:10 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
-#include <net/netisr.h>
 #include <net/bpf.h>
 
 #include <net/if_ether.h>
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/pci/if_jme.c
--- a/sys/dev/pci/if_jme.c      Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/pci/if_jme.c      Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_jme.c,v 1.54 2022/08/21 14:42:24 thorpej Exp $      */
+/*     $NetBSD: if_jme.c,v 1.55 2022/09/02 23:48:10 thorpej Exp $      */
 
 /*
  * Copyright (c) 2008 Manuel Bouyer.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.54 2022/08/21 14:42:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.55 2022/09/02 23:48:10 thorpej Exp $");
 
 
 #include <sys/param.h>
@@ -80,7 +80,6 @@
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
-#include <net/netisr.h>
 #include <net/bpf.h>
 
 #include <sys/rndsource.h>
@@ -88,12 +87,17 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include <netinet/ip_var.h>
+
+#include <netinet6/ip6_var.h>
 
 #ifdef INET
 #include <netinet/in_var.h>
 #endif
 
 #include <netinet/tcp.h>
+#include <netinet/tcp_timer.h>
+#include <netinet/tcp_var.h>
 
 #include <net/if_ether.h>
 #if defined(INET)
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/pci/if_tl.c
--- a/sys/dev/pci/if_tl.c       Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/pci/if_tl.c       Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tl.c,v 1.124 2022/02/23 21:54:41 andvar Exp $       */
+/*     $NetBSD: if_tl.c,v 1.125 2022/09/02 23:48:10 thorpej Exp $      */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.124 2022/02/23 21:54:41 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.125 2022/09/02 23:48:10 thorpej Exp $");
 
 #undef TLDEBUG
 #define TL_PRIV_STATS
@@ -58,7 +58,6 @@
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
-#include <net/netisr.h>
 #include <net/bpf.h>
 
 #include <sys/rndsource.h>
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/ppbus/if_plip.c
--- a/sys/dev/ppbus/if_plip.c   Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/ppbus/if_plip.c   Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.36 2020/02/04 20:46:51 jdolecek Exp $ */
+/* $NetBSD: if_plip.c,v 1.37 2022/09/02 23:48:10 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.36 2020/02/04 20:46:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.37 2022/09/02 23:48:10 thorpej Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
@@ -98,7 +98,6 @@
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 
 #include <sys/time.h>
 #include <net/bpf.h>
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/qbus/if_qt.c
--- a/sys/dev/qbus/if_qt.c      Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/qbus/if_qt.c      Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_qt.c,v 1.26 2021/12/20 17:12:41 rhialto Exp $       */
+/*     $NetBSD: if_qt.c,v 1.27 2022/09/02 23:48:10 thorpej Exp $       */
 /*
  * Copyright (c) 1992 Steven M. Schultz
  * All rights reserved.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.26 2021/12/20 17:12:41 rhialto Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.27 2022/09/02 23:48:10 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -98,7 +98,6 @@
 
 #include <net/if.h>
 #include <net/if_ether.h>
-#include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
 
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/sbus/be.c
--- a/sys/dev/sbus/be.c Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/sbus/be.c Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: be.c,v 1.96 2020/03/19 02:58:54 thorpej Exp $  */
+/*     $NetBSD: be.c,v 1.97 2022/09/02 23:48:10 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.96 2020/03/19 02:58:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.97 2022/09/02 23:48:10 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -77,7 +77,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <net/bpf.h>
diff -r ac773d53c11b -r 7417e62840b4 sys/dev/sbus/qe.c
--- a/sys/dev/sbus/qe.c Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/dev/sbus/qe.c Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qe.c,v 1.77 2020/03/19 02:58:54 thorpej Exp $  */
+/*     $NetBSD: qe.c,v 1.78 2022/09/02 23:48:11 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.77 2020/03/19 02:58:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.78 2022/09/02 23:48:11 thorpej Exp $");
 
 #define QEDEBUG
 
@@ -87,7 +87,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <net/bpf.h>
diff -r ac773d53c11b -r 7417e62840b4 sys/external/bsd/ipf/netinet/ip_auth.c
--- a/sys/external/bsd/ipf/netinet/ip_auth.c    Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_auth.c    Fri Sep 02 23:48:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_auth.c,v 1.6 2018/05/03 07:13:48 maxv Exp $ */
+/*     $NetBSD: ip_auth.c,v 1.7 2022/09/02 23:48:11 thorpej Exp $      */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -114,7 +114,6 @@
 #include "netinet/ip_fil.h"
 #include "netinet/ip_auth.h"
 #if !defined(MENTAT) && !defined(linux)
-# include <net/netisr.h>
 # ifdef __FreeBSD__
 #  include <machine/cpufunc.h>
 # endif
@@ -130,7 +129,7 @@
 
 #if !defined(lint)
 #if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.6 2018/05/03 07:13:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.7 2022/09/02 23:48:11 thorpej Exp $");
 #else
 static const char rcsid[] = "@(#)Id: ip_auth.c,v 1.1.1.2 2012/07/22 13:45:08 darrenr Exp";
 #endif
diff -r ac773d53c11b -r 7417e62840b4 sys/net/raw_usrreq.c
--- a/sys/net/raw_usrreq.c      Fri Sep 02 18:54:25 2022 +0000
+++ b/sys/net/raw_usrreq.c      Fri Sep 02 23:48:10 2022 +0000