From patchwork Sun Dec 20 18:30:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 41513 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 A83C5B6F19 for ; Mon, 21 Dec 2009 05:23:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbZLTSXc (ORCPT ); Sun, 20 Dec 2009 13:23:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751235AbZLTSXb (ORCPT ); Sun, 20 Dec 2009 13:23:31 -0500 Received: from mms1.broadcom.com ([216.31.210.17]:4779 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbZLTSXb (ORCPT ); Sun, 20 Dec 2009 13:23:31 -0500 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Sun, 20 Dec 2009 10:23:07 -0800 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-12.broadcom.com (10.11.16.101) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.1.375.2; Sun, 20 Dec 2009 10:24:29 -0800 Received: from dell (dhcp-10-12-136-112.broadcom.com [10.12.136.112]) by mail-irva-12.broadcom.com (Postfix) with ESMTP id B0C8169CA8; Sun, 20 Dec 2009 10:23:06 -0800 (PST) From: "Michael Chan" To: davem@davemloft.net cc: leitao@linux.vnet.ibm.com, netdev@vger.kernel.org Subject: [PATCH] bnx2: Fix bnx2_netif_stop() merge error. Date: Sun, 20 Dec 2009 10:30:47 -0800 Message-ID: <1261333847-15334-1-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT MIME-Version: 1.0 X-WSS-ID: 6730B4013C839588614-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The error was introduced while merging: commit 4529819c45161e4a119134f56ef504e69420bc98 bnx2: reset_task is crashing the kernel. Fixing it. Signed-off-by: Michael Chan --- drivers/net/bnx2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index f38764e..65df1de 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp) txq->trans_start = jiffies; } } + bnx2_disable_int_sync(bp); } static void @@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp) bnx2_cnic_start(bp); } } - bnx2_disable_int_sync(bp); } static void