Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci fix build when ALTQ is defined



details:   https://anonhg.NetBSD.org/src/rev/a27eb582ccd1
branches:  trunk
changeset: 771312:a27eb582ccd1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Nov 19 12:32:54 2011 +0000

description:
fix build when ALTQ is defined

diffstat:

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

diffs (33 lines):

diff -r cf8aa0cf5359 -r a27eb582ccd1 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Sat Nov 19 12:30:51 2011 +0000
+++ b/sys/dev/pci/if_vioif.c    Sat Nov 19 12:32:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.1 2011/10/30 12:12:21 hannken Exp $     */
+/*     $NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $    */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.1 2011/10/30 12:12:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2 2011/11/19 12:32:54 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -675,9 +675,13 @@
        if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)
                return;
 
-       while (IFQ_POLL(&ifp->if_snd, m), m != NULL) {
+       for (;;) {
                int slot, r;
 
+               IFQ_POLL(&ifp->if_snd, m);
+               if (m == NULL)
+                       break;
+
                r = virtio_enqueue_prep(vsc, vq, &slot);
                if (r == EAGAIN) {
                        ifp->if_flags |= IFF_OACTIVE;



Home | Main Index | Thread Index | Old Index