[src/trunk]: src/sys/dev/pci No longer need to go to splnet() before calling ...

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

details:   https://anonhg.NetBSD.org/src/rev/4c89405ee9e5
branches:  trunk
changeset: 968565:4c89405ee9e5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jan 20 19:45:27 2020 +0000

description:
No longer need to go to splnet() before calling ifmedia_ioctl()
in the NET_MPSAFE; ifmedia_ioctl() will do this for us, if needed.

diffstat:

 sys/dev/pci/if_wm.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 208e97988311 -r 4c89405ee9e5 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Jan 20 19:35:39 2020 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Jan 20 19:45:27 2020 +0000
@@ -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 @@
                        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);