From patchwork Wed Jan 19 01:02:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 79378 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 31177B70CD for ; Wed, 19 Jan 2011 12:02:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751955Ab1ASBCf (ORCPT ); Tue, 18 Jan 2011 20:02:35 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:53137 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965Ab1ASBCe (ORCPT ); Tue, 18 Jan 2011 20:02:34 -0500 Received: by qwa26 with SMTP id 26so263152qwa.19 for ; Tue, 18 Jan 2011 17:02:34 -0800 (PST) Received: by 10.229.96.83 with SMTP id g19mr40018qcn.106.1295398954291; Tue, 18 Jan 2011 17:02:34 -0800 (PST) Received: from arkham.kudzu.us (cpe-72-177-2-76.austin.res.rr.com [72.177.2.76]) by mx.google.com with ESMTPS id g28sm4264813qck.25.2011.01.18.17.02.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 Jan 2011 17:02:33 -0800 (PST) Received: by arkham.kudzu.us (sSMTP sendmail emulation); Tue, 18 Jan 2011 19:02:28 -0600 From: Jon Mason To: "David S. Miller" Cc: netdev@vger.kernel.org, Sivakumar Subramani , Sreenivasa Honnur , Ram Vepa Subject: [PATCH 2/4] vxge: correct eprom version detection Date: Tue, 18 Jan 2011 19:02:20 -0600 Message-Id: <1295398942-4131-2-git-send-email-jon.mason@exar.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1295398942-4131-1-git-send-email-jon.mason@exar.com> References: <1295398942-4131-1-git-send-email-jon.mason@exar.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The firmware PXE EPROM version detection is failing due to passing the wrong parameter into firmware query function. Also, the version printing function has an extraneous newline. Signed-off-by: Jon Mason Signed-off-by: Sivakumar Subramani --- drivers/net/vxge/vxge-config.c | 2 +- drivers/net/vxge/vxge-main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 01c05f5..da35562 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c @@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev, data1 = steer_ctrl = 0; status = vxge_hw_vpath_fw_api(vpath, - VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, VXGE_HW_FW_API_GET_EPROM_REV, + VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, 0, &data0, &data1, &steer_ctrl); if (status != VXGE_HW_OK) break; diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index cd0698c..9d4b0e8 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c @@ -4450,7 +4450,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) if (!img[i].is_valid) break; vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version " - "%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i, + "%d.%d.%d.%d", VXGE_DRIVER_NAME, i, VXGE_EPROM_IMG_MAJOR(img[i].version), VXGE_EPROM_IMG_MINOR(img[i].version), VXGE_EPROM_IMG_FIX(img[i].version),