Module Name: src
Committed By: thorpej
Date: Mon Jan 20 19:45:27 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
No longer need to go to splnet() before calling ifmedia_ioctl()
in the NET_MPSAFE; ifmedia_ioctl() will do this for us, if needed.
To generate a diff of this commit:
cvs rdiff -u -r1.658 -r1.659 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.658 src/sys/dev/pci/if_wm.c:1.659
--- src/sys/dev/pci/if_wm.c:1.658 Fri Dec 13 02:03:46 2019
+++ src/sys/dev/pci/if_wm.c Mon Jan 20 19:45:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.658 2019/12/13 02:03:46 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.659 2020/01/20 19:45:27 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.658 2019/12/13 02:03:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.659 2020/01/20 19:45:27 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3398,13 +3398,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd,
sc->sc_flowflags = ifr->ifr_media & IFM_ETH_FMASK;
}
WM_CORE_UNLOCK(sc);
-#ifdef WM_MPSAFE
- s = splnet();
-#endif
error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
-#ifdef WM_MPSAFE
- splx(s);
-#endif
break;
case SIOCINITIFADDR:
WM_CORE_LOCK(sc);
