From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756832AbYKQHXL (ORCPT ); Mon, 17 Nov 2008 02:23:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752627AbYKQHVA (ORCPT ); Mon, 17 Nov 2008 02:21:00 -0500 Received: from kroah.org ([198.145.64.141]:38249 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752088AbYKQHUy (ORCPT ); Mon, 17 Nov 2008 02:20:54 -0500 Date: Sun, 16 Nov 2008 23:14:38 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Eilon Greenstein , "David S. Miller" , Alex Chiang , Greg Kroah-Hartman Subject: [patch 07/46] bnx2x: Calling netif_carrier_off at the end of the probe Message-ID: <20081117071438.GH29522@kroah.com> References: <20081117070621.430169021@blue.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="bnx2x-calling-netif_carrier_off-at-the-end-of-the-probe.patch" In-Reply-To: <20081117071333.GA29522@kroah.com> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Eilon Greenstein commit 12b56ea89e70d4b04f2f5199750310e82894ebbd upstream. netif_carrier_off was called too early at the probe. In case of failure or simply bad timing, this can cause a fatal error since linkwatch_event might run too soon. Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller Cc: Alex Chiang Signed-off-by: Greg Kroah-Hartman --- drivers/net/bnx2x_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -10205,8 +10205,6 @@ static int __devinit bnx2x_init_one(stru return -ENOMEM; } - netif_carrier_off(dev); - bp = netdev_priv(dev); bp->msglevel = debug; @@ -10230,6 +10228,8 @@ static int __devinit bnx2x_init_one(stru goto init_one_exit; } + netif_carrier_off(dev); + bp->common.name = board_info[ent->driver_data].name; printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx," " IRQ %d, ", dev->name, bp->common.name, --