Module Name: src
Committed By: bouyer
Date: Sat Sep 24 13:21:06 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-6-1]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1401):
sys/dev/pci/if_vioif.c: revision 1.25
Fix initializing wrong queues
Pointed out by Mike Larkin.
PR kern/51448
To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1.2.1 -r1.2.8.1.2.2 src/sys/dev/pci/if_vioif.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/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.8.1.2.1 src/sys/dev/pci/if_vioif.c:1.2.8.1.2.2
--- src/sys/dev/pci/if_vioif.c:1.2.8.1.2.1 Thu Aug 7 09:34:21 2014
+++ src/sys/dev/pci/if_vioif.c Sat Sep 24 13:21:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.8.1.2.1 2014/08/07 09:34:21 msaitoh Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.8.1.2.2 2016/09/24 13:21:06 bouyer Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.8.1.2.1 2014/08/07 09:34:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.8.1.2.2 2016/09/24 13:21:06 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -378,7 +378,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
}
for (i = 0; i < txqsize; i++) {
- C_L1(txhdr_dmamaps[i], rx_hdrs[i],
+ C_L1(txhdr_dmamaps[i], tx_hdrs[i],
sizeof(struct virtio_net_hdr), 1,
WRITE, "tx header");
C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 256 /* XXX */, 0,