From patchwork Mon Jul 11 00:52:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 962822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6B0r4hQ001938 for ; Mon, 11 Jul 2011 00:53:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754504Ab1GKAw7 (ORCPT ); Sun, 10 Jul 2011 20:52:59 -0400 Received: from rere.qmqm.pl ([89.167.52.164]:43686 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753652Ab1GKAwy (ORCPT ); Sun, 10 Jul 2011 20:52:54 -0400 Received: by rere.qmqm.pl (Postfix, from userid 1000) id 755C313A7B; Mon, 11 Jul 2011 02:52:50 +0200 (CEST) Message-Id: <08fc87f027ad07874b83b98786215c94a7acf8b9.1310339688.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v2 15/46] net/wireless: b43: use kfree_skb() for untouched skbs MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Stefano Brivio , "John W. Linville" , linux-wireless@vger.kernel.org Date: Mon, 11 Jul 2011 02:52:50 +0200 (CEST) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 11 Jul 2011 00:53:05 +0000 (UTC) Signed-off-by: Micha? Miros?aw --- drivers/net/wireless/b43/dma.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 15b11f0..ed78f14 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c @@ -592,7 +592,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, /* ugh. try to realloc in zone_dma */ gfp_flags |= GFP_DMA; - dev_kfree_skb_any(skb); + kfree_skb(skb); skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags); if (unlikely(!skb)) @@ -602,7 +602,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, ring->rx_buffersize, 0); if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { b43err(ring->dev->wl, "RX DMA buffer allocation failed\n"); - dev_kfree_skb_any(skb); + kfree_skb(skb); return -EIO; } } @@ -645,7 +645,7 @@ static int alloc_initial_descbuffers(struct b43_dmaring *ring) desc = ring->ops->idx2desc(ring, i, &meta); unmap_descbuffer(ring, meta->dmaaddr, ring->rx_buffersize, 0); - dev_kfree_skb(meta->skb); + kfree_skb(meta->skb); } goto out; }