[src/netbsd-9]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/80fa762f39e1
branches:  netbsd-9
changeset: 1000962:80fa762f39e1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 10 17:32:15 2019 +0000

description:
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.

diffstat:

 sys/arch/x86/pci/if_vmx.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 56fb251cb99f -r 80fa762f39e1 sys/arch/x86/pci/if_vmx.c
--- a/sys/arch/x86/pci/if_vmx.c Thu Oct 10 17:30:02 2019 +0000
+++ b/sys/arch/x86/pci/if_vmx.c Thu Oct 10 17:32:15 2019 +0000
@@ -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_locked(ifp, txq);
                VMXNET3_TXQ_UNLOCK(txq);
        } else {
+               kpreempt_disable();
                softint_schedule(txq->vxtxq_si);
+               kpreempt_enable();
        }
 
        return 0;