Module Name: src
Committed By: martin
Date: Mon Sep 30 15:42:03 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 #268):
sys/arch/x86/pci/if_vmx.c: revision 1.50
Fix typo in vmxnet3_legacy_intr().
That causes sysctl hw.vmx*.{rx,tx} effect inversely when vmx(4) uses
INTx or MSI.
To generate a diff of this commit:
cvs rdiff -u -r1.45.2.2 -r1.45.2.3 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.2 src/sys/arch/x86/pci/if_vmx.c:1.45.2.3
--- src/sys/arch/x86/pci/if_vmx.c:1.45.2.2 Sun Sep 1 13:52:53 2019
+++ src/sys/arch/x86/pci/if_vmx.c Mon Sep 30 15:42:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.45.2.2 2019/09/01 13:52:53 martin Exp $ */
+/* $NetBSD: if_vmx.c,v 1.45.2.3 2019/09/30 15:42:03 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.2 2019/09/01 13:52:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.45.2.3 2019/09/30 15:42:03 martin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -2513,11 +2513,11 @@ vmxnet3_legacy_intr(void *xsc)
vmxnet3_evintr(sc);
VMXNET3_RXQ_LOCK(rxq);
- rxmore = vmxnet3_rxq_eof(rxq, txlimit);
+ rxmore = vmxnet3_rxq_eof(rxq, rxlimit);
VMXNET3_RXQ_UNLOCK(rxq);
VMXNET3_TXQ_LOCK(txq);
- txmore = vmxnet3_txq_eof(txq, rxlimit);
+ txmore = vmxnet3_txq_eof(txq, txlimit);
VMXNET3_TXQ_UNLOCK(txq);
if (txmore || rxmore) {