From patchwork Fri Jan 9 01:04:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 17452 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.176.167]) by ozlabs.org (Postfix) with ESMTP id EFD6DDE77D for ; Fri, 9 Jan 2009 12:04:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759087AbZAIBEr (ORCPT ); Thu, 8 Jan 2009 20:04:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757922AbZAIBEr (ORCPT ); Thu, 8 Jan 2009 20:04:47 -0500 Received: from fg-out-1718.google.com ([72.14.220.159]:31276 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757917AbZAIBEq (ORCPT ); Thu, 8 Jan 2009 20:04:46 -0500 Received: by fg-out-1718.google.com with SMTP id 19so3353070fgg.17 for ; Thu, 08 Jan 2009 17:04:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:content-type :content-transfer-encoding:content-disposition:message-id; bh=r2Cby9TbHy9YcaBs/2eiOBM8+gMKh0Md8NqWOfMihvY=; b=RzIjsKxkYZvBrn+lNPhdPl9ZO8ZMLQj7aaJnt1kgPqzM6E3nvKQX7+VL0QjhmAZZxq 5mYYFZqPL5qvNwPd/Hjm36O2jeKariwVZknWfDl8WUvRcKJINFVKuGhD24iaPrplTud2 1l/Crtu9dQjg8xH9Y2L2ev15SyTIw3tjnpcj0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to :content-type:content-transfer-encoding:content-disposition :message-id; b=LxnBpPtmfXl/3M/cYiWsxIDTVK0paMMsbO8xkVhlCuBZlvb1dri0Hf2VcTobaUOE9I VNaLuMwo4DrTy+lOuMiOnB1zp354ZQeB4AoTW9+mvsugmroaWFZLmtEkedsfZd6FL96g Naeb5lmfXcDjobGk6zwFkuPqbg6NaeguS/xwA= Received: by 10.86.70.3 with SMTP id s3mr9213255fga.78.1231463084565; Thu, 08 Jan 2009 17:04:44 -0800 (PST) Received: from florian.lan.tmplab.org (fbx.tmplab.org [82.228.39.231]) by mx.google.com with ESMTPS id 4sm37623604fgg.24.2009.01.08.17.04.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Jan 2009 17:04:43 -0800 (PST) From: Florian Fainelli Date: Fri, 9 Jan 2009 02:04:39 +0100 Subject: [PATCH 1/4] r6040: fix ifconfig down and freeing of tx/rx descriptors MIME-Version: 1.0 X-UID: 33 X-Length: 2419 To: David Miller , jeff@garzik.org, netdev@vger.kernel.org, Joe Chou Content-Disposition: inline Message-Id: <200901090204.39930.florian@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli Subject: [PATCH 1/4] r6040: fix ifconfig down and freeing of tx/rx descriptors This patch fixes warnings and such traces that appear when doing an ifconfig down on the interface: WARNING: at arch/x86/kernel/pci-dma.c:376 dma_free_coherent+0x40/0x7d() Modules linked in: Signed-off-by: Joe Chou Signed-off-by: Florian Fainelli --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 706a0af..6b8bc6d 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -457,17 +457,6 @@ static void r6040_down(struct net_device *dev) iowrite16(adrp[0], ioaddr + MID_0L); iowrite16(adrp[1], ioaddr + MID_0M); iowrite16(adrp[2], ioaddr + MID_0H); - free_irq(dev->irq, dev); - - /* Free RX buffer */ - r6040_free_rxbufs(dev); - - /* Free TX buffer */ - r6040_free_txbufs(dev); - - /* Free Descriptor memory */ - pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma); - pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma); } static int r6040_close(struct net_device *dev) @@ -481,8 +470,28 @@ static int r6040_close(struct net_device *dev) napi_disable(&lp->napi); netif_stop_queue(dev); r6040_down(dev); + + free_irq(dev->irq, dev); + + /* Free RX buffer */ + r6040_free_rxbufs(dev); + + /* Free TX buffer */ + r6040_free_txbufs(dev); + spin_unlock_irq(&lp->lock); + /* Free Descriptor memory */ + if (lp->rx_ring) { + pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma); + lp->rx_ring = 0; + } + + if (lp->tx_ring) { + pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma); + lp->tx_ring = 0; + } + return 0; }