From patchwork Mon Oct 4 15:14:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: amit salecha X-Patchwork-Id: 90675 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 CB409B6F0C for ; Tue, 12 Apr 2011 08:52:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756299Ab1DKWwf (ORCPT ); Mon, 11 Apr 2011 18:52:35 -0400 Received: from mvnat01.qlogic.com ([198.186.3.73]:55018 "EHLO dut4145.unminc.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756144Ab1DKWwL (ORCPT ); Mon, 11 Apr 2011 18:52:11 -0400 Received: from dut4145.unminc.com (localhost.localdomain [127.0.0.1]) by dut4145.unminc.com (8.13.8/8.13.8) with ESMTP id p3BNmExG018025; Mon, 11 Apr 2011 16:51:57 -0700 Received: (from amit@localhost) by dut4145.unminc.com (8.13.8/8.13.8/Submit) id o94FF1KX023260; Mon, 4 Oct 2010 08:15:01 -0700 X-Authentication-Warning: dut4145.unminc.com: amit set sender to amit.salecha@qlogic.com using -f From: Amit Kumar Salecha To: davem@davemloft.net Cc: netdev@vger.kernel.org, ameen.rahman@qlogic.com, anirban.chakraborty@qlogic.com, Sritej Velaga Subject: [PATCHv2 NEXT 7/8] qlcnic: cleanup port mode setting Date: Mon, 4 Oct 2010 08:14:56 -0700 Message-Id: <1286205297-23214-7-git-send-email-amit.salecha@qlogic.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1286205297-23214-1-git-send-email-amit.salecha@qlogic.com> References: <1286205297-23214-1-git-send-email-amit.salecha@qlogic.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sritej Velaga Port mode setting is not required for Qlogic CNA adapters. Signed-off-by: Sritej Velaga Signed-off-by: Amit Kumar Salecha --- drivers/net/qlcnic/qlcnic_main.c | 40 -------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 59a2138..4757908 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -46,11 +46,6 @@ char qlcnic_driver_name[] = "qlcnic"; static const char qlcnic_driver_string[] = "QLogic 1/10 GbE " "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID; -static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG; - -/* Default to restricted 1G auto-neg mode */ -static int wol_port_mode = 5; - static int qlcnic_mac_learn; module_param(qlcnic_mac_learn, int, 0644); MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)"); @@ -264,40 +259,6 @@ static void qlcnic_clear_stats(struct qlcnic_adapter *adapter) memset(&adapter->stats, 0, sizeof(adapter->stats)); } -static void qlcnic_set_port_mode(struct qlcnic_adapter *adapter) -{ - u32 val, data; - - val = adapter->ahw.board_type; - if ((val == QLCNIC_BRDTYPE_P3_HMEZ) || - (val == QLCNIC_BRDTYPE_P3_XG_LOM)) { - if (port_mode == QLCNIC_PORT_MODE_802_3_AP) { - data = QLCNIC_PORT_MODE_802_3_AP; - QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data); - } else if (port_mode == QLCNIC_PORT_MODE_XG) { - data = QLCNIC_PORT_MODE_XG; - QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data); - } else if (port_mode == QLCNIC_PORT_MODE_AUTO_NEG_1G) { - data = QLCNIC_PORT_MODE_AUTO_NEG_1G; - QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data); - } else if (port_mode == QLCNIC_PORT_MODE_AUTO_NEG_XG) { - data = QLCNIC_PORT_MODE_AUTO_NEG_XG; - QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data); - } else { - data = QLCNIC_PORT_MODE_AUTO_NEG; - QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data); - } - - if ((wol_port_mode != QLCNIC_PORT_MODE_802_3_AP) && - (wol_port_mode != QLCNIC_PORT_MODE_XG) && - (wol_port_mode != QLCNIC_PORT_MODE_AUTO_NEG_1G) && - (wol_port_mode != QLCNIC_PORT_MODE_AUTO_NEG_XG)) { - wol_port_mode = QLCNIC_PORT_MODE_AUTO_NEG; - } - QLCWR32(adapter, QLCNIC_WOL_PORT_MODE, wol_port_mode); - } -} - static void qlcnic_set_msix_bit(struct pci_dev *pdev, int enable) { u32 control; @@ -1032,7 +993,6 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter) err = qlcnic_pinit_from_rom(adapter); if (err) goto err_out; - qlcnic_set_port_mode(adapter); err = qlcnic_load_firmware(adapter); if (err)