Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/arch/x86/pci Pull up following revision(s) (requested...
details: https://anonhg.NetBSD.org/src/rev/8c7ed977bc06
branches: netbsd-9
changeset: 843715:8c7ed977bc06
user: martin <martin%NetBSD.org@localhost>
date: Thu Dec 26 20:19:37 2019 +0000
description:
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.
diffstat:
sys/arch/x86/pci/if_vmx.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r 5d04869bcad0 -r 8c7ed977bc06 sys/arch/x86/pci/if_vmx.c
--- a/sys/arch/x86/pci/if_vmx.c Thu Dec 26 20:16:47 2019 +0000
+++ b/sys/arch/x86/pci/if_vmx.c Thu Dec 26 20:19:37 2019 +0000
@@ -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 @@
break;
}
if (ifp->if_mtu != nmtu) {
+ s = splnet();
error = ether_ioctl(ifp, cmd, data);
+ splx(s);
if (error == ENETRESET)
error = vmxnet3_init(ifp);
}
Home |
Main Index |
Thread Index |
Old Index