Module Name: src
Committed By: thorpej
Date: Fri Sep 2 23:48:11 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa: trap.c
src/sys/arch/sun68k/sun68k: isr.c
src/sys/arch/vax/vax: intvec.S
src/sys/arch/xen/xen: xennetback_xenbus.c
src/sys/dev/pci: if_jme.c if_tl.c
src/sys/dev/ppbus: if_plip.c
src/sys/dev/qbus: if_qt.c
src/sys/dev/sbus: be.c qe.c
src/sys/external/bsd/ipf/netinet: ip_auth.c
src/sys/net: raw_usrreq.c
src/sys/netinet: ip_carp.c
src/sys/netipsec: ipsec_netbsd.c
Log Message:
Remove unnecessary inclusion of <net/netisr.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/hppa/hppa/trap.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sun68k/sun68k/isr.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/vax/vax/intvec.S
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/xen/xen/xennetback_xenbus.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ppbus/if_plip.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/qbus/if_qt.c
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_auth.c
cvs rdiff -u -r1.64 -r1.65 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.116 -r1.117 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.54 -r1.55 src/sys/netipsec/ipsec_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.120 src/sys/arch/hppa/hppa/trap.c:1.121
--- src/sys/arch/hppa/hppa/trap.c:1.120 Thu Jun 9 16:45:38 2022
+++ src/sys/arch/hppa/hppa/trap.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#include <sys/kmem.h>
#include <sys/userret.h>
-#include <net/netisr.h>
-
#ifdef KGDB
#include <sys/kgdb.h>
#endif
Index: src/sys/arch/sun68k/sun68k/isr.c
diff -u src/sys/arch/sun68k/sun68k/isr.c:1.26 src/sys/arch/sun68k/sun68k/isr.c:1.27
--- src/sys/arch/sun68k/sun68k/isr.c:1.26 Sat Nov 21 00:27:52 2020
+++ src/sys/arch/sun68k/sun68k/isr.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.26
#include <uvm/uvm_extern.h>
-#include <net/netisr.h>
-
#include <machine/autoconf.h>
#include <machine/mon.h>
Index: src/sys/arch/vax/vax/intvec.S
diff -u src/sys/arch/vax/vax/intvec.S:1.22 src/sys/arch/vax/vax/intvec.S:1.23
--- src/sys/arch/vax/vax/intvec.S:1.22 Mon May 22 16:46:15 2017
+++ src/sys/arch/vax/vax/intvec.S Fri Sep 2 23:48:10 2022
@@ -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"
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.107 src/sys/arch/xen/xen/xennetback_xenbus.c:1.108
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.107 Thu Sep 1 15:33:23 2022
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: xennetback_x
#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>
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.54 src/sys/dev/pci/if_jme.c:1.55
--- src/sys/dev/pci/if_jme.c:1.54 Sun Aug 21 14:42:24 2022
+++ src/sys/dev/pci/if_jme.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1
#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 @@ __KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1
#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)
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.124 src/sys/dev/pci/if_tl.c:1.125
--- src/sys/dev/pci/if_tl.c:1.124 Wed Feb 23 21:54:41 2022
+++ src/sys/dev/pci/if_tl.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.
#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>
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.36 src/sys/dev/ppbus/if_plip.c:1.37
--- src/sys/dev/ppbus/if_plip.c:1.36 Tue Feb 4 20:46:51 2020
+++ src/sys/dev/ppbus/if_plip.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_plip.c,v
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <sys/time.h>
#include <net/bpf.h>
Index: src/sys/dev/qbus/if_qt.c
diff -u src/sys/dev/qbus/if_qt.c:1.26 src/sys/dev/qbus/if_qt.c:1.27
--- src/sys/dev/qbus/if_qt.c:1.26 Mon Dec 20 17:12:41 2021
+++ src/sys/dev/qbus/if_qt.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.
#include <net/if.h>
#include <net/if_ether.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.96 src/sys/dev/sbus/be.c:1.97
--- src/sys/dev/sbus/be.c:1.96 Thu Mar 19 02:58:54 2020
+++ src/sys/dev/sbus/be.c Fri Sep 2 23:48:10 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.96
#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>
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.77 src/sys/dev/sbus/qe.c:1.78
--- src/sys/dev/sbus/qe.c:1.77 Thu Mar 19 02:58:54 2020
+++ src/sys/dev/sbus/qe.c Fri Sep 2 23:48:11 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.77
#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>
Index: src/sys/external/bsd/ipf/netinet/ip_auth.c
diff -u src/sys/external/bsd/ipf/netinet/ip_auth.c:1.6 src/sys/external/bsd/ipf/netinet/ip_auth.c:1.7
--- src/sys/external/bsd/ipf/netinet/ip_auth.c:1.6 Thu May 3 07:13:48 2018
+++ src/sys/external/bsd/ipf/netinet/ip_auth.c Fri Sep 2 23:48:11 2022
@@ -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 @@ extern struct ifqueue ipintrq; /* ip
#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 @@ extern struct ifqueue ipintrq; /* ip
#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
Index: src/sys/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.64 src/sys/net/raw_usrreq.c:1.65
--- src/sys/net/raw_usrreq.c:1.64 Fri Aug 2 02:17:46 2019
+++ src/sys/net/raw_usrreq.c Fri Sep 2 23:48:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_usrreq.c,v 1.64 2019/08/02 02:17:46 ozaki-r Exp $ */
+/* $NetBSD: raw_usrreq.c,v 1.65 2022/09/02 23:48:11 thorpej Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.64 2019/08/02 02:17:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.65 2022/09/02 23:48:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c
#include <net/if.h>
#include <net/route.h>
-#include <net/netisr.h>
#include <net/raw_cb.h>
static inline int
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.116 src/sys/netinet/ip_carp.c:1.117
--- src/sys/netinet/ip_carp.c:1.116 Thu Sep 30 03:43:25 2021
+++ src/sys/netinet/ip_carp.c Fri Sep 2 23:48:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.116 2021/09/30 03:43:25 yamaguchi Exp $ */
+/* $NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.116 2021/09/30 03:43:25 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $");
/*
* TODO:
@@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include <net/if_types.h>
#include <net/if_ether.h>
#include <net/route.h>
-#include <net/netisr.h>
#include <net/net_stats.h>
#include <netinet/if_inarp.h>
#include <netinet/wqinput.h>
Index: src/sys/netipsec/ipsec_netbsd.c
diff -u src/sys/netipsec/ipsec_netbsd.c:1.54 src/sys/netipsec/ipsec_netbsd.c:1.55
--- src/sys/netipsec/ipsec_netbsd.c:1.54 Sat Apr 28 13:44:19 2018
+++ src/sys/netipsec/ipsec_netbsd.c Fri Sep 2 23:48:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_netbsd.c,v 1.54 2018/04/28 13:44:19 maxv Exp $ */
+/* $NetBSD: ipsec_netbsd.c,v 1.55 2022/09/02 23:48:11 thorpej Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.54 2018/04/28 13:44:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.55 2022/09/02 23:48:11 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd
#include <net/if.h>
#include <net/route.h>
-#include <net/netisr.h>
#include <sys/cpu.h>
#include <netinet/in.h>
