From 33f82d5e4a26e15f14c73de2fa4b0c23ebf4fa21 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Fri, 2 Jul 2010 16:32:55 +0000
Subject: [PATCH] --- yaml --- r: 200882 b: refs/heads/master c:
 1788f49548860fa1c861ee3454d47b466c877e43 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/virtio_net.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2aef8c8e17b7..bfe11ddf6706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a49043223e5047c8f60a09f7b2927a2e6e8dfc7
+refs/heads/master: 1788f49548860fa1c861ee3454d47b466c877e43
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 1edb7a61983c..ee7571195b10 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -415,7 +415,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
 static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
 {
 	int err;
-	bool oom = false;
+	bool oom;
 
 	do {
 		if (vi->mergeable_rx_bufs)
@@ -425,10 +425,9 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
 		else
 			err = add_recvbuf_small(vi, gfp);
 
-		if (err < 0) {
-			oom = true;
+		oom = err == -ENOMEM;
+		if (err < 0)
 			break;
-		}
 		++vi->num;
 	} while (err > 0);
 	if (unlikely(vi->num > vi->max))