CVS commit: [netbsd-9] src/sys/arch/x86/pci

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Dec 26 20:19:37 UTC 2019

Modified Files:
        src/sys/arch/x86/pci [netbsd-9]: if_vmx.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #583):

        sys/arch/x86/pci/if_vmx.c: revision 1.53

Fix missing splnet() for ether_ioctl() caused by if_vmx.c:r1.32.
pointed out by nonaka@n.o, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.45.2.4 -r1.45.2.5 src/sys/arch/x86/pci/if_vmx.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/arch/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.45.2.4 src/sys/arch/x86/pci/if_vmx.c:1.45.2.5
--- src/sys/arch/x86/pci/if_vmx.c:1.45.2.4	Thu Oct 10 17:32:15 2019
+++ src/sys/arch/x86/pci/if_vmx.c	Thu Dec 26 20:19:37 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vmx.c,v 1.45.2.4 2019/10/10 17:32:15 martin Exp $	*/
+/*	$NetBSD: if_vmx.c,v 1.45.2.5 2019/12/26 20:19:37 martin Exp $	*/
 /*	$OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.45.2.4 2019/10/10 17:32:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.45.2.5 2019/12/26 20:19:37 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -3385,7 +3385,9 @@ vmxnet3_ioctl(struct ifnet *ifp, u_long 
 			break;
 		}
 		if (ifp->if_mtu != nmtu) {
+			s = splnet();
 			error = ether_ioctl(ifp, cmd, data);
+			splx(s);
 			if (error == ENETRESET)
 				error = vmxnet3_init(ifp);
 		}