[PATCH] r8169: fix rx skb allocation error logging

Fix rx skb allocation error logging

Signed arithmetic is not required as rtl8169_rx_fill() return belongs
to the [0; NUM_RX_DESC] interval.

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 3f7171fbaebc8e172378aad6051a25d3c0ac1803..289059d9bb5b8a1f7cdfa8492918cdee3cd3c6b6 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2156,8 +2156,8 @@ static int
 rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
                     void __iomem *ioaddr)
 {
-       unsigned int cur_rx, rx_left, count;
-       int delta;
+       unsigned int cur_rx, rx_left;
+       unsigned int delta, count;
 
        assert(dev != NULL);
        assert(tp != NULL);
@@ -2225,10 +2225,8 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
        tp->cur_rx = cur_rx;
 
        delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
-       if (delta < 0) {
+       if (!delta && count)
                printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
-               delta = 0;
-       }
        tp->dirty_rx += delta;
 
        /*