summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2021-01-04 13:56:46 +0000
committerkn <kn@cvs.openbsd.org>2021-01-04 13:56:46 +0000
commitc2205846cde7c83117f110fb6b8686d6a876caec (patch)
tree56a87dbef4c8dd7da3d1f37a880604b35b326204
parent0a2fa73f97ef874961c4915ab2fd940e5079702b (diff)
Remove kernel lock from pppoe(4) input path
"struct pppoe_softc" documents no member being protected by the kernel lock (alone); further review of the code paths starting from pppoeintr() shows no sleeping points which must be avoided in the softnet thread. Everything is fine as is to run without the big lock, so remove it. Tests sthen Feedback mpi mvs OK mvs claudio
-rw-r--r--sys/net/if.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index d83d7e06545..ce8eed20c8e 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.621 2020/12/15 03:43:34 dlg Exp $ */
+/* $OpenBSD: if.c,v 1.622 2021/01/04 13:56:45 kn Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -907,9 +907,7 @@ if_netisr(void *unused)
#endif
#if NPPPOE > 0
if (n & (1 << NETISR_PPPOE)) {
- KERNEL_LOCK();
pppoeintr();
- KERNEL_UNLOCK();
}
#endif
t |= n;