From 2f3aa68eee895b60d2e555b7648975f8d870aedd Mon Sep 17 00:00:00 2001 From: Torsten Kaiser Date: Mon, 9 Apr 2012 05:14:15 +0000 Subject: [PATCH] --- yaml --- r: 299519 b: refs/heads/master c: 31304165ffb888483e0f7c805876f25f493a3049 h: refs/heads/master i: 299517: 22c014f2ffc4d752e9267bdc1beb02f5f019c657 299515: c1afe1c136c2637621fc7fccc7ed1c73ed7f2c17 299511: 15beb56642be3076d1dd916c6a67bf29b49c7e93 299503: b85dc00263c34cb90bf104bef3da879757638572 299487: e68c7f1deaefb3cf125bb0f92de7051eb1911460 299455: c7c5ec119a57db5266cb48fd820a94d07131df60 299391: 9b267327c05c39ba24abee70679017246429370e 299263: e87fa65239325a1c3f3354d9be0b2860370b633e 299007: b54b3d7783de977fee86ff27b40fa62a289f2ead v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9a7736bc2656..6282ed4634c6 100644 --- 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 index 4de2760c5937..af8acc85f4bb 100644 --- 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);