From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 23 Mar 2006 19:07:25 +0000 (-0800)
Subject: [PATCH] skge: rx_reuse called twice
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a01144717ee9dacd45e1b0861a2c593796bcead;p=linux-beck.git

[PATCH] skge: rx_reuse called twice

In the error case we call skge_rx_reuse twice. This is harmless
but unnecessary.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index b0aa150bbd8a..72148f0fbfcc 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -781,7 +781,7 @@ static void skge_rx_setup(struct skge_port *skge, struct skge_element *e,
  * Note: DMA address is not changed by chip.
  * 	 MTU not changed while receiver active.
  */
-static void skge_rx_reuse(struct skge_element *e, unsigned int size)
+static inline void skge_rx_reuse(struct skge_element *e, unsigned int size)
 {
 	struct skge_rx_desc *rd = e->desc;
 
@@ -2719,8 +2719,7 @@ static int skge_poll(struct net_device *dev, int *budget)
 			netif_receive_skb(skb);
 
 			++work_done;
-		} else
-			skge_rx_reuse(e, skge->rx_buf_size);
+		}
 	}
 	ring->to_clean = e;