From patchwork Fri Apr 13 17:24:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 152355 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 287AEB700E for ; Sat, 14 Apr 2012 03:24:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064Ab2DMRYY (ORCPT ); Fri, 13 Apr 2012 13:24:24 -0400 Received: from mail.vyatta.com ([76.74.103.46]:43015 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752307Ab2DMRYR (ORCPT ); Fri, 13 Apr 2012 13:24:17 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 85AA91410016; Fri, 13 Apr 2012 10:24:15 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J-GgH2QAoEud; Fri, 13 Apr 2012 10:24:14 -0700 (PDT) Received: from nehalam.linuxnetplumber.net (static-50-53-80-93.bvtn.or.frontiernet.net [50.53.80.93]) by mail.vyatta.com (Postfix) with ESMTPSA id 7317F1410001; Fri, 13 Apr 2012 10:24:14 -0700 (PDT) Date: Fri, 13 Apr 2012 10:24:13 -0700 From: Stephen Hemminger To: David Miller Cc: LinoSanfilippo@gmx.de, mlindner@marvell.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: sky2: in free_buffers() do proper checks before call of rx_clean() Message-ID: <20120413102413.41c0d053@nehalam.linuxnetplumber.net> In-Reply-To: <20120413.125954.1123124134206162716.davem@davemloft.net> References: <20120403001327.GB10227@Neptun> <20120413.125954.1123124134206162716.davem@davemloft.net> Organization: Vyatta X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org How about this instead? It moves the rx_clean out of free_buffers and into the proper place in the unwind code. --- 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 --- a/drivers/net/ethernet/marvell/sky2.c 2012-04-12 08:07:11.572640522 -0700 +++ b/drivers/net/ethernet/marvell/sky2.c 2012-04-13 10:19:39.466839378 -0700 @@ -1630,7 +1630,8 @@ static int sky2_alloc_buffers(struct sky if (!sky2->rx_ring) goto nomem; - return sky2_alloc_rx_skbs(sky2); + return 0; + nomem: return -ENOMEM; } @@ -1639,8 +1640,6 @@ static void sky2_free_buffers(struct sky { struct sky2_hw *hw = sky2->hw; - sky2_rx_clean(sky2); - if (sky2->rx_le) { pci_free_consistent(hw->pdev, RX_LE_BYTES, sky2->rx_le, sky2->rx_le_map); @@ -1761,9 +1760,13 @@ static int sky2_open(struct net_device * if (err) goto err_out; + err = sky2_alloc_rx_skbs(sky2); + if (err) + goto err_clean; + /* With single port, IRQ is setup when device is brought up */ if (hw->ports == 1 && (err = sky2_setup_irq(hw, dev->name))) - goto err_out; + goto err_clean; sky2_hw_up(sky2); @@ -1783,6 +1786,8 @@ static int sky2_open(struct net_device * return 0; +err_clean: + sky2_rx_clean(sky2); err_out: sky2_free_buffers(sky2); return err; @@ -2158,6 +2163,7 @@ static int sky2_close(struct net_device sky2_hw_down(sky2); + sky2_rx_clean(sky2); sky2_free_buffers(sky2); return 0;