Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/ixgbe/ixv.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/ixgbe/ixv.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- src/sys/dev/pci/ixgbe/ixv.c 2019/08/20 04:11:22 1.126 +++ src/sys/dev/pci/ixgbe/ixv.c 2019/08/21 06:00:07 1.127 @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.126 2019/08/20 04:11:22 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.127 2019/08/21 06:00:07 msaitoh Exp $*/ /****************************************************************************** @@ -2001,7 +2001,7 @@ ixv_setup_vlan_support(struct adapter *a for (int i = 0; i < IXGBE_VFTA_SIZE; i++) adapter->shadow_vfta[i] = 0; /* Generate shadow_vfta from ec_vids */ - mutex_enter(ec->ec_lock); + ETHER_LOCK(ec); SIMPLEQ_FOREACH(vlanidp, &ec->ec_vids, vid_list) { uint32_t idx; @@ -2009,7 +2009,7 @@ ixv_setup_vlan_support(struct adapter *a KASSERT(idx < IXGBE_VFTA_SIZE); adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32); } - mutex_exit(ec->ec_lock); + ETHER_UNLOCK(ec); /* * A soft reset zero's out the VFTA, so