From patchwork Wed May 5 14:47:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 51698 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A9ABBB7BEE for ; Thu, 6 May 2010 00:48:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934745Ab0EEOsN (ORCPT ); Wed, 5 May 2010 10:48:13 -0400 Received: from Chamillionaire.breakpoint.cc ([85.10.199.196]:51298 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933722Ab0EEOsA (ORCPT ); Wed, 5 May 2010 10:48:00 -0400 Received: id: bigeasy by Chamillionaire.breakpoint.cc authenticated by bigeasy with local (easymta 1.00 BETA 1) id 1O9ftG-00023o-Un; Wed, 05 May 2010 16:47:58 +0200 From: Sebastian Andrzej Siewior To: netdev@vger.kernel.org Cc: tglx@linutronix.de, Sebastian Andrzej Siewior Subject: [RFC 4/5] net/stmmac: use generic recycling infrastructure Date: Wed, 5 May 2010 16:47:49 +0200 Message-Id: <1273070870-7821-5-git-send-email-sebastian@breakpoint.cc> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1273070870-7821-1-git-send-email-sebastian@breakpoint.cc> References: <1273070870-7821-1-git-send-email-sebastian@breakpoint.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sebastian Andrzej Siewior Signed-off-by: Sebastian Andrzej Siewior --- drivers/net/stmmac/stmmac.h | 1 - drivers/net/stmmac/stmmac_main.c | 26 +++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h index ebebc64..dbf9f95 100644 --- a/drivers/net/stmmac/stmmac.h +++ b/drivers/net/stmmac/stmmac.h @@ -44,7 +44,6 @@ struct stmmac_priv { unsigned int dirty_rx; struct sk_buff **rx_skbuff; dma_addr_t *rx_skbuff_dma; - struct sk_buff_head rx_recycle; struct net_device *dev; int is_gmac; diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 7ac6dde..14c4e25 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -646,18 +646,7 @@ static void stmmac_tx(struct stmmac_priv *priv) p->des3 = 0; if (likely(skb != NULL)) { - /* - * If there's room in the queue (limit it to size) - * we add this skb back into the pool, - * if it's the right size. - */ - if ((skb_queue_len(&priv->rx_recycle) < - priv->dma_rx_size) && - skb_recycle_check(skb, priv->dma_buf_sz)) - __skb_queue_head(&priv->rx_recycle, skb); - else - dev_kfree_skb(skb); - + net_recycle_add(priv->dev, skb); priv->tx_skbuff[entry] = NULL; } @@ -860,6 +849,9 @@ static int stmmac_open(struct net_device *dev) priv->dma_buf_sz = STMMAC_ALIGN(buf_sz); init_dma_desc_rings(dev); + net_recycle_init(priv->dev, priv->dma_rx_size, priv->dma_buf_sz + + NET_IP_ALIGN); + /* DMA initialization and SW reset */ if (unlikely(priv->hw->dma->init(ioaddr, priv->pbl, priv->dma_tx_phy, priv->dma_rx_phy) < 0)) { @@ -911,7 +903,6 @@ static int stmmac_open(struct net_device *dev) phy_start(priv->phydev); napi_enable(&priv->napi); - skb_queue_head_init(&priv->rx_recycle); netif_start_queue(dev); return 0; } @@ -942,7 +933,7 @@ static int stmmac_release(struct net_device *dev) kfree(priv->tm); #endif napi_disable(&priv->napi); - skb_queue_purge(&priv->rx_recycle); + net_recycle_cleanup(priv->dev); /* Free the IRQ lines */ free_irq(dev->irq, dev); @@ -1174,13 +1165,10 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) if (likely(priv->rx_skbuff[entry] == NULL)) { struct sk_buff *skb; - skb = __skb_dequeue(&priv->rx_recycle); - if (skb == NULL) - skb = netdev_alloc_skb_ip_align(priv->dev, - bfsize); - + skb = net_recycle_get(priv->dev); if (unlikely(skb == NULL)) break; + skb_reserve(skb, NET_IP_ALIGN); priv->rx_skbuff[entry] = skb; priv->rx_skbuff_dma[entry] =