CVS commit: src/sys/dev/pci

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Dec 25 06:39:26 UTC 2014

Modified Files:
        src/sys/dev/pci: if_vioif.c

Log Message:
Reuse mbuf when retrying in vioif_start

Otherwise, the old mbuf will leak.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/dev/pci/if_vioif.c:1.14
--- src/sys/dev/pci/if_vioif.c:1.13	Wed Dec 24 02:48:24 2014
+++ src/sys/dev/pci/if_vioif.c	Thu Dec 25 06:39:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.13 2014/12/24 02:48:24 ozaki-r Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.14 2014/12/25 06:39:26 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.13 2014/12/24 02:48:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.14 2014/12/25 06:39:26 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -758,12 +758,13 @@ vioif_start(struct ifnet *ifp)
 		if (m == NULL)
 			break;
 
+retry:
 		r = virtio_enqueue_prep(vsc, vq, &slot);
 		if (r == EAGAIN) {
 			ifp->if_flags |= IFF_OACTIVE;
 			vioif_tx_vq_done_locked(vq);
 			if (retry++ == 0)
-				continue;
+				goto retry;
 			else
 				break;
 		}
@@ -786,7 +787,7 @@ vioif_start(struct ifnet *ifp)
 			ifp->if_flags |= IFF_OACTIVE;
 			vioif_tx_vq_done_locked(vq);
 			if (retry++ == 0)
-				continue;
+				goto retry;
 			else
 				break;
 		}