[src/netbsd-6-0]: src/sys/dev/pci Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/5b06dce72c51
branches:  netbsd-6-0
changeset: 774805:5b06dce72c51
user:      riz <riz%NetBSD.org@localhost>
date:      Sun May 12 16:38:33 2013 +0000

description:
Pull up following revision(s) (requested by minoura in ticket #890):
        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.

diffstat:

 sys/dev/pci/if_vioif.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 5b091377b566 -r 5b06dce72c51 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Sat May 11 21:54:50 2013 +0000
+++ b/sys/dev/pci/if_vioif.c    Sun May 12 16:38:33 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $    */
+/*     $NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $    */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -151,7 +151,6 @@
 
        uint8_t                 sc_mac[ETHER_ADDR_LEN];
        struct ethercom         sc_ethercom;
-       uint32_t                sc_features;
        short                   sc_ifflags;
 
        /* bus_dmamem */
@@ -654,7 +653,7 @@
                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)