[src/netbsd-8]: src/sys/net Additionally pull up r1.131 for ticket #1066 (req...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3612111fca81
branches:  netbsd-8
changeset: 445307:3612111fca81
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 22 07:41:12 2018 +0000

description:
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.

diffstat:

 sys/net/if_vlan.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r aa7d716d4f78 -r 3612111fca81 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Sun Oct 21 12:12:51 2018 +0000
+++ b/sys/net/if_vlan.c Mon Oct 22 07:41:12 2018 +0000
@@ -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 @@
                                         * 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 @@
        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 @@
        membar_producer();
        ifv->ifv_mib = nmib;
 
-       pserialize_perform(vlan_psz);
+       pserialize_perform(ifv->ifv_psz);
        psref_target_destroy(&omib->ifvm_psref, ifvm_psref_class);
 }