From 724a6f3a67082197ed3a614538a997f7519f2908 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Tue, 19 Oct 2010 00:06:36 +0000 Subject: [PATCH] --- yaml --- r: 218451 b: refs/heads/master c: cd0ea2419544cfc4ccbf8ee0087d0d9f109852d2 h: refs/heads/master i: 218449: e53f41380cb5c104edd258a143ec28c2a610ed41 218447: 92ff7fa973134ea1d166ca567615b0029e732164 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9cf12285766d..f526970cc9c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a876b0efcba3804da3051313445fa7be751cab7 +refs/heads/master: cd0ea2419544cfc4ccbf8ee0087d0d9f109852d2 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 4c4cc80ec0a1..49e4ce1246a7 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -2511,7 +2511,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) skb_recycle_check(skb, priv->rx_buffer_size + RXBUF_ALIGNMENT)) { gfar_align_skb(skb); - __skb_queue_head(&priv->rx_recycle, skb); + skb_queue_head(&priv->rx_recycle, skb); } else dev_kfree_skb_any(skb); @@ -2594,7 +2594,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev) struct gfar_private *priv = netdev_priv(dev); struct sk_buff *skb = NULL; - skb = __skb_dequeue(&priv->rx_recycle); + skb = skb_dequeue(&priv->rx_recycle); if (!skb) skb = gfar_alloc_skb(dev); @@ -2750,7 +2750,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit) if (unlikely(!newskb)) newskb = skb; else if (skb) - __skb_queue_head(&priv->rx_recycle, skb); + skb_queue_head(&priv->rx_recycle, skb); } else { /* Increment the number of packets */ rx_queue->stats.rx_packets++;