summaryrefslogtreecommitdiff
path: root/sys/netinet6/in6_pcb.c
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2022-08-06 15:58:00 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2022-08-06 15:58:00 +0000
commit409abbff9f32d306ab690ec1c14af8f2ddce03c0 (patch)
treeee2e9cb5da0b5195b43439451fa17e5cef5f652b /sys/netinet6/in6_pcb.c
parentab145a9e5831225c036713bed82e67894fbc61de (diff)
Clean up the netlock macros. Merge NET_RLOCK_IN_SOFTNET and
NET_RLOCK_IN_IOCTL, which have the same implementation. The R and W are hard to see, call the new macro NET_LOCK_SHARED. Rename the opposite assertion from NET_ASSERT_WLOCKED to NET_ASSERT_LOCKED_EXCLUSIVE. Update some outdated comments about net locking. OK mpi@ mvs@
Diffstat (limited to 'sys/netinet6/in6_pcb.c')
-rw-r--r--sys/netinet6/in6_pcb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 115c8167cdf..bbd6f88afdc 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_pcb.c,v 1.117 2022/04/14 14:10:22 claudio Exp $ */
+/* $OpenBSD: in6_pcb.c,v 1.118 2022/08/06 15:57:59 bluhm Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -375,7 +375,7 @@ in6_pcbnotify(struct inpcbtable *table, struct sockaddr_in6 *dst,
u_int32_t flowinfo;
u_int rdomain;
- NET_ASSERT_WLOCKED();
+ NET_ASSERT_LOCKED_EXCLUSIVE();
if ((unsigned)cmd >= PRC_NCMDS)
return;