Module Name: src
Committed By: msaitoh
Date: Thu Apr 12 08:03:55 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Read sc_if_flags after taking core lock. Same as if_wm.c rev. 1.418.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/ixgbe/ixv.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/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.145 src/sys/dev/pci/ixgbe/ixgbe.c:1.146
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.145 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Apr 12 08:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.145 2018/04/04 08:59:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.146 2018/04/12 08:03:55 msaitoh Exp $ */
/******************************************************************************
@@ -5760,10 +5760,11 @@ ixgbe_ifflags_cb(struct ethercom *ec)
{
struct ifnet *ifp = &ec->ec_if;
struct adapter *adapter = ifp->if_softc;
- int change = ifp->if_flags ^ adapter->if_flags, rc = 0;
+ int change, rc = 0;
IXGBE_CORE_LOCK(adapter);
+ change = ifp->if_flags ^ adapter->if_flags;
if (change != 0)
adapter->if_flags = ifp->if_flags;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.92 src/sys/dev/pci/ixgbe/ixv.c:1.93
--- src/sys/dev/pci/ixgbe/ixv.c:1.92 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Apr 12 08:03:55 2018
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.92 2018/04/04 08:59:22 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.93 2018/04/12 08:03:55 msaitoh Exp $*/
/******************************************************************************
@@ -2691,10 +2691,11 @@ ixv_ifflags_cb(struct ethercom *ec)
{
struct ifnet *ifp = &ec->ec_if;
struct adapter *adapter = ifp->if_softc;
- int change = ifp->if_flags ^ adapter->if_flags, rc = 0;
+ int change, rc = 0;
IXGBE_CORE_LOCK(adapter);
+ change = ifp->if_flags ^ adapter->if_flags;
if (change != 0)
adapter->if_flags = ifp->if_flags;
