]> err.no Git - linux-2.6/commitdiff
[PATCH] skge: rx_reuse called twice
authorStephen Hemminger <shemminger@osdl.org>
Thu, 23 Mar 2006 19:07:25 +0000 (11:07 -0800)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 22:13:54 +0000 (17:13 -0500)
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>
drivers/net/skge.c

index b0aa150bbd8a6b49e989252be17659d151715789..72148f0fbfccdfe9598e1013cd898f12b1cf7e02 100644 (file)
@@ -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;