Message ID | 20120409171415.4c49c96a@googlemail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Torsten Kaiser <just.for.lkml@googlemail.com> Date: Mon, 9 Apr 2012 17:14:15 +0200 > Commit 2e57b79ccef1ff1422fdf45a9b28fe60f8f084f7 misplaced its > parenthesis and now tx_fifo_errors will only be incremented if an > ENOMEM error is not written to the syslog. > > Correct the parenthesis and indentation to the original goal of > counting all non ENOMEM errors and ratelimiting only the messages. > > Signed-of-by: Torsten Kaiser <just.for.lkml@googlemail.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/virtio_net.c 2012-04-09 16:55:31.366847092 +0200 +++ b/drivers/net/virtio_net.c 2012-04-09 16:56:31.196847799 +0200 @@ -626,16 +626,15 @@ /* 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);