Module Name: src
Committed By: msaitoh
Date: Sun Jun 9 11:51:40 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-5]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by minoura in ticket #1861):
sys/dev/pci/if_vioif.c: revision 1.4
Fix a typo, and remove an unused member.
This should fix the problem that recent Qemu dies during configuring a vioif.
Fixes PR#47780.
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 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.6.2 src/sys/dev/pci/if_vioif.c:1.2.6.3
--- src/sys/dev/pci/if_vioif.c:1.2.6.2 Wed Jan 25 21:18:15 2012
+++ src/sys/dev/pci/if_vioif.c Sun Jun 9 11:51:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.6.2 2012/01/25 21:18:15 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.6.3 2013/06/09 11:51:40 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.6.2 2012/01/25 21:18:15 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.6.3 2013/06/09 11:51:40 msaitoh Exp $");
#include "bpfilter.h"
@@ -155,7 +155,6 @@ struct vioif_softc {
uint8_t sc_mac[ETHER_ADDR_LEN];
struct ethercom sc_ethercom;
- uint32_t sc_features;
short sc_ifflags;
/* bus_dmamem */
@@ -658,7 +657,7 @@ vioif_stop(struct ifnet *ifp, int disabl
vioif_rx_drain(sc);
virtio_reinit_start(vsc);
- virtio_negotiate_features(vsc, sc->sc_features);
+ virtio_negotiate_features(vsc, vsc->sc_features);
virtio_start_vq_intr(vsc, &sc->sc_vq[0]);
virtio_stop_vq_intr(vsc, &sc->sc_vq[1]);
if (vsc->sc_nvqs >= 3)
