From ce70294dbce55e1e76509456d9cc32253dc6edfa Mon Sep 17 00:00:00 2001
From: Rick Jones <rick.jones2@hp.com>
Date: Tue, 27 Mar 2012 07:28:09 +0000
Subject: [PATCH] --- yaml --- r: 298467 b: refs/heads/master c:
 2e57b79ccef1ff1422fdf45a9b28fe60f8f084f7 h: refs/heads/master i:   298465:
 d9ebaa7fd91f9ce2cd705d9f8615ce620c51c968   298463:
 190ae0da0a6b9a8cbd18fb2ff3ee1cdc4741068a v: v3

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

diff --git a/[refs] b/[refs]
index 6043ffae3d95..294cdeebbd8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973db5696e6481433fa1bbf4ddc01c56a83effd7
+refs/heads/master: 2e57b79ccef1ff1422fdf45a9b28fe60f8f084f7
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 019da012669f..4de2760c5937 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -625,12 +625,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	/* This can happen with OOM and indirect buffers. */
 	if (unlikely(capacity < 0)) {
-		if (net_ratelimit()) {
-			if (likely(capacity == -ENOMEM)) {
+		if (likely(capacity == -ENOMEM)) {
+			if (net_ratelimit()) {
 				dev_warn(&dev->dev,
 					 "TX queue failure: out of memory\n");
 			} else {
-				dev->stats.tx_fifo_errors++;
+			dev->stats.tx_fifo_errors++;
+			if (net_ratelimit())
 				dev_warn(&dev->dev,
 					 "Unexpected TX queue failure: %d\n",
 					 capacity);