---

yaml --- r: 299519 b: refs/heads/master c: 3130416 h: refs/heads/master i: 299517: 22c014f 299515: c1afe1c 299511: 15beb56 299503: b85dc00 299487: e68c7f1 299455: c7c5ec1 299391: 9b26732 299263: e87fa65 299007: b54b3d7 v: v3
git-mirror · Apr 13, 2012 · 2f3aa68 · 2f3aa68
1 parent f687a6c
commit 2f3aa68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89eb06f11c314c2ab4ec59039715dc021933a7a0
+refs/heads/master: 31304165ffb888483e0f7c805876f25f493a3049
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
@@ -626,16 +626,15 @@ 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 (likely(capacity == -ENOMEM)) {
-			if (net_ratelimit()) {
+			if (net_ratelimit())
 				dev_warn(&dev->dev,
 					 "TX queue failure: out of memory\n");
-			} else {
+		} else {
 			dev->stats.tx_fifo_errors++;
 			if (net_ratelimit())
 				dev_warn(&dev->dev,
 					 "Unexpected TX queue failure: %d\n",
 					 capacity);
-			}
 		}
 		dev->stats.tx_dropped++;
 		kfree_skb(skb);