Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read sc_if_flags after taking core lock

This commit is contained in:
skrll 2016-10-11 15:48:17 +00:00
parent d9119dc54f
commit b7cb5d9d35
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.417 2016/08/10 04:52:40 knakahara Exp $ */ /* $NetBSD: if_wm.c,v 1.418 2016/10/11 15:48:17 skrll Exp $ */
/* /*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -84,7 +84,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.417 2016/08/10 04:52:40 knakahara Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.418 2016/10/11 15:48:17 skrll Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h" #include "opt_net_mpsafe.h"
@ -2807,13 +2807,12 @@ wm_ifflags_cb(struct ethercom *ec)
{ {
struct ifnet *ifp = &ec->ec_if; struct ifnet *ifp = &ec->ec_if;
struct wm_softc *sc = ifp->if_softc; struct wm_softc *sc = ifp->if_softc;
int change = ifp->if_flags ^ sc->sc_if_flags;
int rc = 0; int rc = 0;
WM_CORE_LOCK(sc); WM_CORE_LOCK(sc);
if (change != 0) int change = ifp->if_flags ^ sc->sc_if_flags;
sc->sc_if_flags = ifp->if_flags; sc->sc_if_flags = ifp->if_flags;
if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) { if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
rc = ENETRESET; rc = ENETRESET;