From patchwork Wed Jun 20 13:06:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Borundia X-Patchwork-Id: 166068 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 6542EB6FA1 for ; Wed, 20 Jun 2012 23:08:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755643Ab2FTNIX (ORCPT ); Wed, 20 Jun 2012 09:08:23 -0400 Received: from [213.199.154.139] ([213.199.154.139]:4818 "EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755583Ab2FTNIP convert rfc822-to-8bit (ORCPT ); Wed, 20 Jun 2012 09:08:15 -0400 Received: from mail114-db3-R.bigfish.com (10.3.81.234) by DB3EHSOBE003.bigfish.com (10.3.84.23) with Microsoft SMTP Server id 14.1.225.23; Wed, 20 Jun 2012 13:05:19 +0000 Received: from mail114-db3 (localhost [127.0.0.1]) by mail114-db3-R.bigfish.com (Postfix) with ESMTP id B4F2A4E02E6; Wed, 20 Jun 2012 13:05:19 +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: -1 X-BigFish: VPS-1(zz9371Izz1202hzz8275bhz2fh2a8h668h839h944hd25hf0ah) Received-SPF: pass (mail114-db3: 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 mail114-db3 (localhost.localdomain [127.0.0.1]) by mail114-db3 (MessageSwitch) id 1340197517402050_24930; Wed, 20 Jun 2012 13:05:17 +0000 (UTC) Received: from DB3EHSMHS012.bigfish.com (unknown [10.3.81.227]) by mail114-db3.bigfish.com (Postfix) with ESMTP id 5677C2E0046; Wed, 20 Jun 2012 13:05:17 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.61) by DB3EHSMHS012.bigfish.com (10.3.87.112) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 20 Jun 2012 13:05:17 +0000 Received: from MNEXCASHUB1.qlogic.org (10.33.2.103) by avexcashub1.qlogic.org (10.1.4.161) with Microsoft SMTP Server (TLS) id 8.3.192.1; Wed, 20 Jun 2012 06:06:38 -0700 Received: from MNEXMB1.qlogic.org ([fe80::8516:7839:9549:6996]) by MNEXCASHUB1.qlogic.org ([::1]) with mapi; Wed, 20 Jun 2012 08:06:36 -0500 From: Rajesh Borundia To: santosh nayak , Sony Chacko CC: netdev , "kernel-janitors@vger.kernel.org" Date: Wed, 20 Jun 2012 08:06:04 -0500 Subject: RE: [PATCH] netxen : Error return off by one for XG port. Thread-Topic: [PATCH] netxen : Error return off by one for XG port. Thread-Index: Ac1O0un1WPu1fmEXSoKGSbaM7nbIvwAEoiUn Message-ID: <13A253B3F9BEFE43B93C09CF75F63CAA81A886EF1A@MNEXMB1.qlogic.org> References: <1340189578-18308-1-git-send-email-santoshprasadnayak@gmail.com> In-Reply-To: <1340189578-18308-1-git-send-email-santoshprasadnayak@gmail.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_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index d4f179f..9103e3e 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c @@ -511,7 +511,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, break; } } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { - if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS)) + if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS)) return; pause->rx_pause = 1; val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL); @@ -577,7 +577,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, } NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val); } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { - if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS)) + if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS)) return -EIO; val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL); if (port == 0) { diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index de96a94..946160f 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c @@ -365,7 +365,7 @@ static int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) return 0; - if (port > NETXEN_NIU_MAX_XG_PORTS) + if (port >= NETXEN_NIU_MAX_XG_PORTS) return -EINVAL; mac_cfg = 0; @@ -392,7 +392,7 @@ static int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode) u32 port = adapter->physical_port; u16 board_type = adapter->ahw.board_type; - if (port > NETXEN_NIU_MAX_XG_PORTS) + if (port >= NETXEN_NIU_MAX_XG_PORTS) return -EINVAL; mac_cfg = NXRD32(adapter, NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port));