diff --git a/[refs] b/[refs] index 30f137fe95c4..30494b285f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5d56ddc3f839e94e97a3eb8afb4d0d64a9f2ef8 +refs/heads/master: 5a01144717ee9dacd45e1b0861a2c593796bcead diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index b0aa150bbd8a..72148f0fbfcc 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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;