Module Name: src
Committed By: thorpej
Date: Sat Sep 3 02:48:01 UTC 2022
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/dev/ic: hd64570.c
src/sys/dev/pci: if_vte.c
src/sys/dev/usb: uhso.c
src/sys/kern: kern_softint.c
src/sys/net: Makefile if.c if.h if_arcsubr.c if_ethersubr.c if_faith.c
if_gif.c if_gre.c if_ieee1394subr.c if_l2tp.c if_loop.c if_media.c
if_mpls.c if_ppp.c if_sl.c if_spppsubr.c if_stf.c
src/sys/netatalk: ddp_input.c
src/sys/netcan: if_canloop.c
src/sys/rump/include/rump-sys: net.h
src/sys/rump/net/lib/libnetcan: netcan_component.c
src/sys/rump/net/lib/libnetinet: netinet_component.c
src/sys/rump/net/lib/libnetinet6: netinet6_component.c
src/sys/rump/net/lib/libnetmpls: netmpls_component.c
Removed Files:
src/sys/net: netisr.h netisr_dispatch.h
src/sys/rump/librump/rumpnet: netisr.c
Log Message:
Garbage-collect the remaining vestiges of netisr.
To generate a diff of this commit:
cvs rdiff -u -r1.2418 -r1.2419 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.70 -r1.71 src/sys/kern/kern_softint.c
cvs rdiff -u -r1.45 -r1.46 src/sys/net/Makefile
cvs rdiff -u -r1.523 -r1.524 src/sys/net/if.c
cvs rdiff -u -r1.300 -r1.301 src/sys/net/if.h
cvs rdiff -u -r1.84 -r1.85 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.319 -r1.320 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.62 -r1.63 src/sys/net/if_faith.c
cvs rdiff -u -r1.156 -r1.157 src/sys/net/if_gif.c
cvs rdiff -u -r1.183 -r1.184 src/sys/net/if_gre.c
cvs rdiff -u -r1.68 -r1.69 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.47 -r1.48 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.116 -r1.117 src/sys/net/if_loop.c
cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_media.c
cvs rdiff -u -r1.39 -r1.40 src/sys/net/if_mpls.c
cvs rdiff -u -r1.171 -r1.172 src/sys/net/if_ppp.c
cvs rdiff -u -r1.134 -r1.135 src/sys/net/if_sl.c
cvs rdiff -u -r1.265 -r1.266 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.108 -r1.109 src/sys/net/if_stf.c
cvs rdiff -u -r1.46 -r0 src/sys/net/netisr.h
cvs rdiff -u -r1.24 -r0 src/sys/net/netisr_dispatch.h
cvs rdiff -u -r1.32 -r1.33 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.9 -r1.10 src/sys/netcan/if_canloop.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump-sys/net.h
cvs rdiff -u -r1.10 -r0 src/sys/rump/librump/rumpnet/netisr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libnetcan/netcan_component.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/rump/net/lib/libnetinet/netinet_component.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/rump/net/lib/libnetinet6/netinet6_component.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnetmpls/netmpls_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2418 src/distrib/sets/lists/comp/mi:1.2419
--- src/distrib/sets/lists/comp/mi:1.2418 Sat Aug 27 08:31:58 2022
+++ src/distrib/sets/lists/comp/mi Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2418 2022/08/27 08:31:58 christos Exp $
+# $NetBSD: mi,v 1.2419 2022/09/03 02:47:59 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2638,7 +2638,7 @@
./usr/include/net/if_wg.h comp-c-include
./usr/include/net/nd.h comp-c-include
./usr/include/net/net_stats.h comp-c-include
-./usr/include/net/netisr.h comp-c-include
+./usr/include/net/netisr.h comp-obsolete obsolete
./usr/include/net/npf.h comp-c-include
./usr/include/net/npf_ncode.h comp-obsolete obsolete
./usr/include/net/pfil.h comp-c-include
Index: src/sys/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.56 src/sys/dev/ic/hd64570.c:1.57
--- src/sys/dev/ic/hd64570.c:1.56 Tue Aug 17 22:00:31 2021
+++ src/sys/dev/ic/hd64570.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.56 2021/08/17 22:00:31 andvar Exp $ */
+/* $NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.56 2021/08/17 22:00:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $");
#include "opt_inet.h"
@@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: hd64570.c,v
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#if defined(INET) || defined(INET6)
#include <netinet/in.h>
@@ -1533,7 +1532,6 @@ static void
sca_frame_process(sca_port_t *scp)
{
pktqueue_t *pktq = NULL;
- struct ifqueue *ifq = NULL;
struct hdlc_header *hdlc;
struct cisco_pkt *cisco;
sca_desc_t *desc;
@@ -1541,7 +1539,6 @@ sca_frame_process(sca_port_t *scp)
u_int8_t *bufp;
u_int16_t len;
u_int32_t t;
- int isr = 0;
t = time_uptime * 1000;
desc = &scp->sp_rxdesc[scp->sp_rxstart];
@@ -1659,12 +1656,11 @@ sca_frame_process(sca_port_t *scp)
cisco->time0 = htons((u_int16_t)(t >> 16));
cisco->time1 = htons((u_int16_t)(t & 0x0000ffff));
- ifq = &scp->linkq;
- if (IF_QFULL(ifq)) {
- IF_DROP(ifq);
+ if (IF_QFULL(&scp->linkq)) {
+ IF_DROP(&scp->linkq);
goto dropit;
}
- IF_ENQUEUE(ifq, m);
+ IF_ENQUEUE(&scp->linkq, m);
sca_start(&scp->sp_if);
@@ -1693,18 +1689,8 @@ sca_frame_process(sca_port_t *scp)
}
/* Queue the packet */
- if (__predict_true(pktq)) {
- if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
- if_statinc(&scp->sp_if, if_iqdrops);
- goto dropit;
- }
- return;
- }
- if (!IF_QFULL(ifq)) {
- IF_ENQUEUE(ifq, m);
- schednetisr(isr);
- } else {
- IF_DROP(ifq);
+ KASSERT(pktq != NULL);
+ if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
if_statinc(&scp->sp_if, if_iqdrops);
goto dropit;
}
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.32 src/sys/dev/pci/if_vte.c:1.33
--- src/sys/dev/pci/if_vte.c:1.32 Mon Aug 30 20:09:22 2021
+++ src/sys/dev/pci/if_vte.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.32 2021/08/30 20:09:22 andvar Exp $ */
+/* $NetBSD: if_vte.c,v 1.33 2022/09/03 02:48:00 thorpej Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.32 2021/08/30 20:09:22 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.33 2022/09/03 02:48:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_vte.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/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.35 src/sys/dev/usb/uhso.c:1.36
--- src/sys/dev/usb/uhso.c:1.35 Sun Jun 13 09:27:20 2021
+++ src/sys/dev/usb/uhso.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.35 2021/06/13 09:27:20 mlelstv Exp $ */
+/* $NetBSD: uhso.c,v 1.36 2022/09/03 02:48:00 thorpej Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.35 2021/06/13 09:27:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.36 2022/09/03 02:48:00 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.3
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
-#include <net/netisr.h>
+#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
Index: src/sys/kern/kern_softint.c
diff -u src/sys/kern/kern_softint.c:1.70 src/sys/kern/kern_softint.c:1.71
--- src/sys/kern/kern_softint.c:1.70 Wed Mar 30 17:02:02 2022
+++ src/sys/kern/kern_softint.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.70 2022/03/30 17:02:02 riastradh Exp $ */
+/* $NetBSD: kern_softint.c,v 1.71 2022/09/03 02:48:00 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.70 2022/03/30 17:02:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.71 2022/09/03 02:48:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -183,8 +183,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_softint
#include <sys/evcnt.h>
#include <sys/cpu.h>
#include <sys/xcall.h>
-
-#include <net/netisr.h>
+#include <sys/psref.h>
#include <uvm/uvm_extern.h>
@@ -223,7 +222,6 @@ u_int softint_bytes = 32768;
u_int softint_timing;
static u_int softint_max;
static kmutex_t softint_lock;
-static void *softint_netisrs[NETISR_MAX];
/*
* softint_init_isr:
@@ -317,15 +315,6 @@ softint_init(struct cpu_info *ci)
&sc->sc_int[sh->sh_flags & SOFTINT_LVLMASK];
}
mutex_exit(&softint_lock);
- } else {
- /*
- * Establish handlers for legacy net interrupts.
- * XXX Needs to go away.
- */
-#define DONETISR(n, f) \
- softint_netisrs[(n)] = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,\
- (void (*)(void *))(f), NULL)
-#include <net/netisr_dispatch.h>
}
}
@@ -609,18 +598,6 @@ softint_block(lwp_t *l)
si->si_evcnt_block.ev_count++;
}
-/*
- * schednetisr:
- *
- * Trigger a legacy network interrupt. XXX Needs to go away.
- */
-void
-schednetisr(int isr)
-{
-
- softint_schedule(softint_netisrs[isr]);
-}
-
#ifndef __HAVE_FAST_SOFTINTS
#ifdef __HAVE_PREEMPTION
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.45 src/sys/net/Makefile:1.46
--- src/sys/net/Makefile:1.45 Mon May 17 04:07:43 2021
+++ src/sys/net/Makefile Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2021/05/17 04:07:43 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.46 2022/09/03 02:47:59 thorpej Exp $
INCSDIR= /usr/include/net
@@ -7,7 +7,7 @@ INCS= bpf.h bpfjit.h bpfdesc.h dlt.h eth
if_gre.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stats.h \
if_stf.h if_tap.h if_tun.h if_types.h if_vlanvar.h if_wg.h \
- nd.h net_stats.h netisr.h \
+ nd.h net_stats.h \
pfil.h pfkeyv2.h pfvar.h ppp-comp.h ppp_defs.h radix.h \
raw_cb.h route.h slcompress.h slip.h zlib.h
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.523 src/sys/net/if.c:1.524
--- src/sys/net/if.c:1.523 Fri Sep 2 05:50:36 2022
+++ src/sys/net/if.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.523 2022/09/02 05:50:36 thorpej Exp $ */
+/* $NetBSD: if.c,v 1.524 2022/09/03 02:47:59 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.523 2022/09/02 05:50:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.524 2022/09/03 02:47:59 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -132,7 +132,6 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.523
#include <net80211/ieee80211_ioctl.h>
#include <net/if_types.h>
#include <net/route.h>
-#include <net/netisr.h>
#include <sys/module.h>
#ifdef NETATALK
#include <netatalk/at_extern.h>
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.300 src/sys/net/if.h:1.301
--- src/sys/net/if.h:1.300 Sat Aug 20 11:09:24 2022
+++ src/sys/net/if.h Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.300 2022/08/20 11:09:24 riastradh Exp $ */
+/* $NetBSD: if.h,v 1.301 2022/09/03 02:47:59 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -1088,20 +1088,6 @@ do { \
#define IFQ_INC_DROPS(ifq) ((ifq)->ifq_drops++)
#define IFQ_SET_MAXLEN(ifq, len) ((ifq)->ifq_maxlen = (len))
-#define IFQ_ENQUEUE_ISR(ifq, m, isr) \
-do { \
- IFQ_LOCK(inq); \
- if (IF_QFULL(inq)) { \
- IF_DROP(inq); \
- IFQ_UNLOCK(inq); \
- m_freem(m); \
- } else { \
- IF_ENQUEUE(inq, m); \
- IFQ_UNLOCK(inq); \
- schednetisr(isr); \
- } \
-} while (/*CONSTCOND*/ 0)
-
#include <sys/mallocvar.h>
MALLOC_DECLARE(M_IFADDR);
MALLOC_DECLARE(M_IFMADDR);
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.84 src/sys/net/if_arcsubr.c:1.85
--- src/sys/net/if_arcsubr.c:1.84 Sat Sep 3 01:35:03 2022
+++ src/sys/net/if_arcsubr.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.84 2022/09/03 01:35:03 thorpej Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.85 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.84 2022/09/03 01:35:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.85 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c
#include <sys/cpu.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/if_dl.h>
#include <net/if_types.h>
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.319 src/sys/net/if_ethersubr.c:1.320
--- src/sys/net/if_ethersubr.c:1.319 Sat Sep 3 02:24:59 2022
+++ src/sys/net/if_ethersubr.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.319 2022/09/03 02:24:59 thorpej Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.320 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.319 2022/09/03 02:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.320 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -92,7 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr
#include <sys/hook.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/if_llc.h>
#include <net/if_dl.h>
Index: src/sys/net/if_faith.c
diff -u src/sys/net/if_faith.c:1.62 src/sys/net/if_faith.c:1.63
--- src/sys/net/if_faith.c:1.62 Wed Jun 16 00:21:19 2021
+++ src/sys/net/if_faith.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_faith.c,v 1.62 2021/06/16 00:21:19 riastradh Exp $ */
+/* $NetBSD: if_faith.c,v 1.63 2022/09/03 02:47:59 thorpej Exp $ */
/* $KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.62 2021/06/16 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.63 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_faith.c,v
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
#include <net/if_faith.h>
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.156 src/sys/net/if_gif.c:1.157
--- src/sys/net/if_gif.c:1.156 Mon Oct 11 05:13:11 2021
+++ src/sys/net/if_gif.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.156 2021/10/11 05:13:11 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.157 2022/09/03 02:47:59 thorpej Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.156 2021/10/11 05:13:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.157 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.183 src/sys/net/if_gre.c:1.184
--- src/sys/net/if_gre.c:1.183 Sat Sep 3 02:24:59 2022
+++ src/sys/net/if_gre.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.183 2022/09/03 02:24:59 thorpej Exp $ */
+/* $NetBSD: if_gre.c,v 1.184 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.183 2022/09/03 02:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.184 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_atalk.h"
@@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1
#include <net/ethertypes.h>
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <sys/device.h>
#include <sys/module.h>
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.68 src/sys/net/if_ieee1394subr.c:1.69
--- src/sys/net/if_ieee1394subr.c:1.68 Sat Sep 3 01:35:03 2022
+++ src/sys/net/if_ieee1394subr.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.68 2022/09/03 01:35:03 thorpej Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.69 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.68 2022/09/03 01:35:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.69 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ieee1394s
#include <net/if_types.h>
#include <net/if_media.h>
#include <net/ethertypes.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.47 src/sys/net/if_l2tp.c:1.48
--- src/sys/net/if_l2tp.c:1.47 Wed Jun 16 00:21:19 2021
+++ src/sys/net/if_l2tp.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.47 2021/06/16 00:21:19 riastradh Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.48 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.47 2021/06/16 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.48 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
#include <net/if_vlanvar.h>
Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.116 src/sys/net/if_loop.c:1.117
--- src/sys/net/if_loop.c:1.116 Sat Sep 3 02:24:59 2022
+++ src/sys/net/if_loop.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.116 2022/09/03 02:24:59 thorpej Exp $ */
+/* $NetBSD: if_loop.c,v 1.117 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.116 2022/09/03 02:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.117 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -90,7 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_loop.c,v
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#ifdef INET
@@ -99,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_loop.c,v
#include <netinet/in_var.h>
#include <netinet/in_offload.h>
#include <netinet/ip.h>
+#include <netinet/ip_var.h>
#endif
#ifdef INET6
Index: src/sys/net/if_media.c
diff -u src/sys/net/if_media.c:1.53 src/sys/net/if_media.c:1.54
--- src/sys/net/if_media.c:1.53 Wed Oct 6 20:42:44 2021
+++ src/sys/net/if_media.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.c,v 1.53 2021/10/06 20:42:44 andvar Exp $ */
+/* $NetBSD: if_media.c,v 1.54 2022/09/03 02:47:59 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2020 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.53 2021/10/06 20:42:44 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.54 2022/09/03 02:47:59 thorpej Exp $");
#define __IFMEDIA_PRIVATE
@@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_media.c,v
#include <net/if.h>
#include <net/if_media.h>
-#include <net/netisr.h>
static void ifmedia_status(struct ifmedia *, struct ifnet *,
struct ifmediareq *);
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.39 src/sys/net/if_mpls.c:1.40
--- src/sys/net/if_mpls.c:1.39 Sat Sep 3 02:24:59 2022
+++ src/sys/net/if_mpls.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.39 2022/09/03 02:24:59 thorpej Exp $ */
+/* $NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.39 2022/09/03 02:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v
#include <net/bpf.h>
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <sys/device.h>
#include <sys/module.h>
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.171 src/sys/net/if_ppp.c:1.172
--- src/sys/net/if_ppp.c:1.171 Sat Aug 27 19:15:00 2022
+++ src/sys/net/if_ppp.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.171 2022/08/27 19:15:00 thorpej Exp $ */
+/* $NetBSD: if_ppp.c,v 1.172 2022/09/03 02:47:59 thorpej Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.171 2022/08/27 19:15:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.172 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -137,7 +137,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <netinet/in.h>
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.134 src/sys/net/if_sl.c:1.135
--- src/sys/net/if_sl.c:1.134 Sat Aug 27 19:19:10 2022
+++ src/sys/net/if_sl.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.134 2022/08/27 19:19:10 thorpej Exp $ */
+/* $NetBSD: if_sl.c,v 1.135 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.134 2022/08/27 19:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.135 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -90,7 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#ifdef INET
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.265 src/sys/net/if_spppsubr.c:1.266
--- src/sys/net/if_spppsubr.c:1.265 Sat Sep 3 00:31:02 2022
+++ src/sys/net/if_spppsubr.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.265 2022/09/03 00:31:02 thorpej Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.266 2022/09/03 02:47:59 thorpej Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.265 2022/09/03 00:31:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.266 2022/09/03 02:47:59 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include <sys/cpu.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <net/if_types.h>
#include <net/route.h>
#include <net/ppp_defs.h>
@@ -639,10 +638,8 @@ sppp_input(struct ifnet *ifp, struct mbu
{
struct ppp_header *h = NULL;
pktqueue_t *pktq = NULL;
- struct ifqueue *inq = NULL;
uint16_t protocol;
struct sppp *sp = (struct sppp *)ifp;
- int isr = 0;
/* No RPS for not-IP. */
pktq_rps_hash_func_t rps_hash = NULL;
@@ -780,35 +777,16 @@ sppp_input(struct ifnet *ifp, struct mbu
#endif
}
- if ((ifp->if_flags & IFF_UP) == 0 || (!inq && !pktq)) {
+ if ((ifp->if_flags & IFF_UP) == 0 || pktq == NULL) {
goto drop;
}
/* Check queue. */
- if (__predict_true(pktq)) {
- const uint32_t hash =
- rps_hash ? pktq_rps_hash(&rps_hash, m) : 0;
- if (__predict_false(!pktq_enqueue(pktq, m, hash))) {
- goto drop;
- }
- SPPP_UNLOCK(sp);
- return;
- }
-
- SPPP_UNLOCK(sp);
-
- IFQ_LOCK(inq);
- if (IF_QFULL(inq)) {
- /* Queue overflow. */
- IF_DROP(inq);
- IFQ_UNLOCK(inq);
- SPPP_DLOG(sp,"protocol queue overflow\n");
- SPPP_LOCK(sp, RW_READER);
+ const uint32_t hash = rps_hash ? pktq_rps_hash(&rps_hash, m) : 0;
+ if (__predict_false(!pktq_enqueue(pktq, m, hash))) {
goto drop;
}
- IF_ENQUEUE(inq, m);
- IFQ_UNLOCK(inq);
- schednetisr(isr);
+ SPPP_UNLOCK(sp);
return;
drop:
Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.108 src/sys/net/if_stf.c:1.109
--- src/sys/net/if_stf.c:1.108 Wed Jun 16 00:21:19 2021
+++ src/sys/net/if_stf.c Sat Sep 3 02:47:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stf.c,v 1.108 2021/06/16 00:21:19 riastradh Exp $ */
+/* $NetBSD: if_stf.c,v 1.109 2022/09/03 02:47:59 thorpej Exp $ */
/* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.108 2021/06/16 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.109 2022/09/03 02:47:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1
#include <net/if.h>
#include <net/route.h>
-#include <net/netisr.h>
#include <net/if_types.h>
#include <net/if_stf.h>
Index: src/sys/netatalk/ddp_input.c
diff -u src/sys/netatalk/ddp_input.c:1.32 src/sys/netatalk/ddp_input.c:1.33
--- src/sys/netatalk/ddp_input.c:1.32 Sat Sep 3 01:48:22 2022
+++ src/sys/netatalk/ddp_input.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_input.c,v 1.32 2022/09/03 01:48:22 thorpej Exp $ */
+/* $NetBSD: ddp_input.c,v 1.33 2022/09/03 02:48:00 thorpej Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,13 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.32 2022/09/03 01:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.33 2022/09/03 02:48:00 thorpej Exp $");
#include "opt_atalk.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <net/netisr.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: src/sys/netcan/if_canloop.c
diff -u src/sys/netcan/if_canloop.c:1.9 src/sys/netcan/if_canloop.c:1.10
--- src/sys/netcan/if_canloop.c:1.9 Wed Jan 29 05:20:26 2020
+++ src/sys/netcan/if_canloop.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_canloop.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $ */
+/* $NetBSD: if_canloop.c,v 1.10 2022/09/03 02:48:00 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.10 2022/09/03 02:48:00 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_can.h"
@@ -57,10 +57,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_canloop.c
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#ifdef CAN
#include <netcan/can.h>
+#include <netcan/can_var.h>
#endif
void canloopattach(int);
Index: src/sys/rump/include/rump-sys/net.h
diff -u src/sys/rump/include/rump-sys/net.h:1.1 src/sys/rump/include/rump-sys/net.h:1.2
--- src/sys/rump/include/rump-sys/net.h:1.1 Tue Jan 26 23:12:17 2016
+++ src/sys/rump/include/rump-sys/net.h Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: net.h,v 1.1 2016/01/26 23:12:17 pooka Exp $ */
+/* $NetBSD: net.h,v 1.2 2022/09/03 02:48:00 thorpej Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -28,8 +28,6 @@
#ifndef _SYS_RUMP_NET_PRIVATE_H_
#define _SYS_RUMP_NET_PRIVATE_H_
-void rump_netisr_register(int, void (*)(void));
-
#include <rump-sys/net_if.h>
#endif /* _SYS_RUMP_NET_PRIVATE_H_ */
Index: src/sys/rump/net/lib/libnetcan/netcan_component.c
diff -u src/sys/rump/net/lib/libnetcan/netcan_component.c:1.4 src/sys/rump/net/lib/libnetcan/netcan_component.c:1.5
--- src/sys/rump/net/lib/libnetcan/netcan_component.c:1.4 Sat Sep 3 02:07:33 2022
+++ src/sys/rump/net/lib/libnetcan/netcan_component.c Sat Sep 3 02:48:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: netcan_component.c,v 1.4 2022/09/03 02:07:33 thorpej Exp $ */
+/* $NetBSD: netcan_component.c,v 1.5 2022/09/03 02:48:00 thorpej Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netcan_component.c,v 1.4 2022/09/03 02:07:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netcan_component.c,v 1.5 2022/09/03 02:48:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -34,7 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: netcan_compo
#include <rump-sys/kern.h>
#include <rump-sys/net.h>
-#include <net/netisr.h>
#include <netcan/can_var.h>
RUMP_COMPONENT(RUMP_COMPONENT_NET)
Index: src/sys/rump/net/lib/libnetinet/netinet_component.c
diff -u src/sys/rump/net/lib/libnetinet/netinet_component.c:1.12 src/sys/rump/net/lib/libnetinet/netinet_component.c:1.13
--- src/sys/rump/net/lib/libnetinet/netinet_component.c:1.12 Sat Sep 3 01:35:03 2022
+++ src/sys/rump/net/lib/libnetinet/netinet_component.c Sat Sep 3 02:48:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: netinet_component.c,v 1.12 2022/09/03 01:35:03 thorpej Exp $ */
+/* $NetBSD: netinet_component.c,v 1.13 2022/09/03 02:48:01 thorpej Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.12 2022/09/03 01:35:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.13 2022/09/03 02:48:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: netinet_comp
#include <sys/socketvar.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
Index: src/sys/rump/net/lib/libnetinet6/netinet6_component.c
diff -u src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.6 src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.7
--- src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.6 Sat Aug 13 11:19:35 2016
+++ src/sys/rump/net/lib/libnetinet6/netinet6_component.c Sat Sep 3 02:48:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: netinet6_component.c,v 1.6 2016/08/13 11:19:35 christos Exp $ */
+/* $NetBSD: netinet6_component.c,v 1.7 2022/09/03 02:48:01 thorpej Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.6 2016/08/13 11:19:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.7 2022/09/03 02:48:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -34,7 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: netinet6_com
#include <sys/socketvar.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <netinet/in.h>
#include <netinet/ip_var.h>
Index: src/sys/rump/net/lib/libnetmpls/netmpls_component.c
diff -u src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.6 src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.7
--- src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.6 Sat Sep 3 02:24:59 2022
+++ src/sys/rump/net/lib/libnetmpls/netmpls_component.c Sat Sep 3 02:48:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: netmpls_component.c,v 1.6 2022/09/03 02:24:59 thorpej Exp $ */
+/* $NetBSD: netmpls_component.c,v 1.7 2022/09/03 02:48:01 thorpej Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,14 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.6 2022/09/03 02:24:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.7 2022/09/03 02:48:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/domain.h>
#include <sys/protosw.h>
#include <net/if.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <netmpls/mpls_var.h>
