Module Name: src
Committed By: martin
Date: Mon Oct 22 07:41:12 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if_vlan.c
Log Message:
Additionally pull up r1.131 for ticket #1066 (requested by knakahara):
Use a different psz for a different lock. Patch from riastradh, reviewed
by ozaki-r.
To generate a diff of this commit:
cvs rdiff -u -r1.97.2.15 -r1.97.2.16 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.97.2.15 src/sys/net/if_vlan.c:1.97.2.16
--- src/sys/net/if_vlan.c:1.97.2.15 Sun Oct 21 11:55:54 2018
+++ src/sys/net/if_vlan.c Mon Oct 22 07:41:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.97.2.15 2018/10/21 11:55:54 martin Exp $ */
+/* $NetBSD: if_vlan.c,v 1.97.2.16 2018/10/22 07:41:12 martin Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.15 2018/10/21 11:55:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.16 2018/10/22 07:41:12 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -161,6 +161,7 @@ struct ifvlan {
* instead of direct dereference
*/
kmutex_t ifv_lock; /* writer lock for ifv_mib */
+ pserialize_t ifv_psz;
LIST_HEAD(__vlan_mchead, vlan_mc_entry) ifv_mc_listhead;
LIST_ENTRY(ifvlan) ifv_list;
@@ -350,6 +351,7 @@ vlan_clone_create(struct if_clone *ifc,
psref_target_init(&mib->ifvm_psref, ifvm_psref_class);
mutex_init(&ifv->ifv_lock, MUTEX_DEFAULT, IPL_NONE);
+ ifv->ifv_psz = pserialize_create();
ifv->ifv_mib = mib;
mutex_enter(&ifv_list.lock);
@@ -788,7 +790,7 @@ vlan_linkmib_update(struct ifvlan *ifv,
membar_producer();
ifv->ifv_mib = nmib;
- pserialize_perform(vlan_psz);
+ pserialize_perform(ifv->ifv_psz);
psref_target_destroy(&omib->ifvm_psref, ifvm_psref_class);
}
