From patchwork Tue Dec 16 23:20:55 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2.6.29,02/14] gianfar: Fix skb allocation error Date: Tue, 16 Dec 2008 13:20:55 -0000 From: Andy Fleming X-Patchwork-Id: 14361 Message-Id: <1229469667-25002-3-git-send-email-afleming@freescale.com> To: jeff@garzik.org Cc: galak@kernel.crashing.org, netdev@vger.kernel.org, Andy Fleming We don't want to unmap the skb if we've decided to use the old one, so we only unmap it if we're *not* using the old one. Signed-off-by: Andy Fleming --- drivers/net/gianfar.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 6ceff8d..7040a17 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1659,8 +1659,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit) if (unlikely(!newskb)) newskb = skb; - - if (skb) { + else if (skb) { dma_unmap_single(&priv->dev->dev, bdp->bufPtr, priv->rx_buffer_size,