From patchwork Mon Sep 17 17:53:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Borundia X-Patchwork-Id: 184520 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 2B5652C0082 for ; Tue, 18 Sep 2012 03:53:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757007Ab2IQRxq (ORCPT ); Mon, 17 Sep 2012 13:53:46 -0400 Received: from co1ehsobe003.messaging.microsoft.com ([216.32.180.186]:52616 "EHLO co1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756900Ab2IQRxp convert rfc822-to-8bit (ORCPT ); Mon, 17 Sep 2012 13:53:45 -0400 Received: from mail189-co1-R.bigfish.com (10.243.78.240) by CO1EHSOBE011.bigfish.com (10.243.66.74) with Microsoft SMTP Server id 14.1.225.23; Mon, 17 Sep 2012 17:53:44 +0000 Received: from mail189-co1 (localhost [127.0.0.1]) by mail189-co1-R.bigfish.com (Postfix) with ESMTP id C8A191E0167; Mon, 17 Sep 2012 17:53:44 +0000 (UTC) X-Forefront-Antispam-Report: CIP:198.70.193.61; KIP:(null); UIP:(null); IPV:NLI; H:avexcashub1.qlogic.com; RD:avexcashub1.qlogic.com; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zz9371Id6eahd6f1izz1202h1d1ah1d2ahzz8275bhz2fh2a8h668h839h944hd25hf0ah107ah1220h1288h12a5h12a9h12bdh1155h) Received-SPF: pass (mail189-co1: domain of qlogic.com designates 198.70.193.61 as permitted sender) client-ip=198.70.193.61; envelope-from=rajesh.borundia@qlogic.com; helo=avexcashub1.qlogic.com ; 1.qlogic.com ; Received: from mail189-co1 (localhost.localdomain [127.0.0.1]) by mail189-co1 (MessageSwitch) id 1347904422408762_2623; Mon, 17 Sep 2012 17:53:42 +0000 (UTC) Received: from CO1EHSMHS009.bigfish.com (unknown [10.243.78.238]) by mail189-co1.bigfish.com (Postfix) with ESMTP id 60013680059; Mon, 17 Sep 2012 17:53:42 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.61) by CO1EHSMHS009.bigfish.com (10.243.66.19) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 17 Sep 2012 17:53:41 +0000 Received: from AVCASHUB3.qlogic.org (10.1.4.192) by avexcashub1.qlogic.org (10.1.4.161) with Microsoft SMTP Server (TLS) id 8.3.192.1; Mon, 17 Sep 2012 10:53:40 -0700 Received: from MNEXCASHUB2.qlogic.org (10.33.2.104) by avcashub3.qlogic.org (10.1.4.192) with Microsoft SMTP Server (TLS) id 14.2.318.1; Mon, 17 Sep 2012 10:53:40 -0700 Received: from MNEXMB1.qlogic.org ([fe80::8516:7839:9549:6996]) by MNEXCASHUB2.qlogic.org ([::1]) with mapi; Mon, 17 Sep 2012 12:53:38 -0500 From: Rajesh Borundia To: "nikolay@redhat.com" , Sony Chacko CC: netdev Date: Mon, 17 Sep 2012 12:53:26 -0500 Subject: RE: [PATCH] netxen: check for root bus in netxen_mask_aer_correctable Thread-Topic: [PATCH] netxen: check for root bus in netxen_mask_aer_correctable Thread-Index: Ac2SkMxmqiMvREpaTZeDTnDeQQgRZACbIpmB Message-ID: <13A253B3F9BEFE43B93C09CF75F63CAA827E3AE9F9@MNEXMB1.qlogic.org> References: <1347637803-4837-1-git-send-email-nikolay@redhat.com> In-Reply-To: <1347637803-4837-1-git-send-email-nikolay@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-OriginatorOrg: qlogic.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 342b3a7..e2a4858 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1378,6 +1378,10 @@ static void netxen_mask_aer_correctable(struct netxen_adapter *adapter) struct pci_dev *root = pdev->bus->self; u32 aer_pos; + /* root bus? */ + if (!root) + return; + if (adapter->ahw.board_type != NETXEN_BRDTYPE_P3_4_GB_MM && adapter->ahw.board_type != NETXEN_BRDTYPE_P3_10G_TP) return;