From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757284Ab1DGBjv (ORCPT ); Wed, 6 Apr 2011 21:39:51 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:52098 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754396Ab1DGBjt (ORCPT ); Wed, 6 Apr 2011 21:39:49 -0400 Date: Thu, 7 Apr 2011 11:39:43 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sathya Perla , Ajit Khaparde Subject: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20110407113943.2f054e2f.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.24.3; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/benet/be_main.c between commit 2d5d41546504 ("be2net: Fix a potential crash during shutdown.") from the net-current tree and commit 0f4a68288217 ("be2net: cancel be_worker in be_shutdown() even when i/f is down") from the net tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/benet/be_main.c index 88d4c80,a24fb45..0000000 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@@ -3142,14 -3152,11 +3153,13 @@@ static int be_resume(struct pci_dev *pd static void be_shutdown(struct pci_dev *pdev) { struct be_adapter *adapter = pci_get_drvdata(pdev); - struct net_device *netdev = adapter->netdev; + + if (!adapter) + return; - if (netif_running(adapter->netdev)) - cancel_delayed_work_sync(&adapter->work); + cancel_delayed_work_sync(&adapter->work); - netif_device_detach(netdev); + netif_device_detach(adapter->netdev); be_cmd_reset_function(adapter);