From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759617Ab0JVTDC (ORCPT ); Fri, 22 Oct 2010 15:03:02 -0400 Received: from kroah.org ([198.145.64.141]:34416 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759502Ab0JVS5E (ORCPT ); Fri, 22 Oct 2010 14:57:04 -0400 X-Mailbox-Line: From gregkh@clark.site Fri Oct 22 11:52:35 2010 Message-Id: <20101022185235.149218983@clark.site> User-Agent: quilt/0.48-11.2 Date: Fri, 22 Oct 2010 11:52:01 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Paul Fertser , "David S. Miller" Subject: [087/103] b44: fix carrier detection on bind In-Reply-To: <20101022185455.GA9114@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.35-stable review patch. If anyone has any objections, please let us know. ------------------ From: Paul Fertser commit bcf64aa379fcadd074449cbf0c049da70071b06f upstream. For carrier detection to work properly when binding the driver with a cable unplugged, netif_carrier_off() should be called after register_netdev(), not before. Signed-off-by: Paul Fertser Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/b44.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2168,8 +2168,6 @@ static int __devinit b44_init_one(struct dev->irq = sdev->irq; SET_ETHTOOL_OPS(dev, &b44_ethtool_ops); - netif_carrier_off(dev); - err = ssb_bus_powerup(sdev->bus, 0); if (err) { dev_err(sdev->dev, @@ -2209,6 +2207,8 @@ static int __devinit b44_init_one(struct goto err_out_powerdown; } + netif_carrier_off(dev); + ssb_set_drvdata(sdev, dev); /* Chip reset provides power to the b44 MAC & PCI cores, which