Module Name: src
Committed By: martin
Date: Thu Oct 10 17:32:15 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 #298):
sys/arch/x86/pci/if_vmx.c: revision 1.51
Fix kassert failure in vmxnet3_transmit(). Pointed out by ryo@n.o, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.45.2.3 -r1.45.2.4 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.3 src/sys/arch/x86/pci/if_vmx.c:1.45.2.4
--- src/sys/arch/x86/pci/if_vmx.c:1.45.2.3 Mon Sep 30 15:42:03 2019
+++ src/sys/arch/x86/pci/if_vmx.c Thu Oct 10 17:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.45.2.3 2019/09/30 15:42:03 martin Exp $ */
+/* $NetBSD: if_vmx.c,v 1.45.2.4 2019/10/10 17:32:15 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.3 2019/09/30 15:42:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.45.2.4 2019/10/10 17:32:15 martin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -3276,7 +3276,9 @@ vmxnet3_transmit(struct ifnet *ifp, stru
vmxnet3_transmit_locked(ifp, txq);
VMXNET3_TXQ_UNLOCK(txq);
} else {
+ kpreempt_disable();
softint_schedule(txq->vxtxq_si);
+ kpreempt_enable();
}
return 0;
