From patchwork Thu Jul 15 14:53:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Walukiewicz, Miroslaw" X-Patchwork-Id: 112245 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6FErATc028794 for ; Thu, 15 Jul 2010 14:53:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933433Ab0GOOxc (ORCPT ); Thu, 15 Jul 2010 10:53:32 -0400 Received: from mga09.intel.com ([134.134.136.24]:63049 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933400Ab0GOOxc (ORCPT ); Thu, 15 Jul 2010 10:53:32 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 15 Jul 2010 07:52:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,208,1278313200"; d="scan'208";a="638788328" Received: from cmsutil001.isw.intel.com ([10.237.237.10]) by orsmga001.jf.intel.com with ESMTP; 15 Jul 2010 07:53:30 -0700 Received: from gkslx010.igk.intel.com (gkslx010.igk.intel.com [172.28.168.161]) by cmsutil001.isw.intel.com (8.12.11.20060308/8.12.11/MailSET/Hub) with ESMTP id o6FErTsg018174; Thu, 15 Jul 2010 15:53:29 +0100 Received: from gkslx010.igk.intel.com (localhost [127.0.0.1]) by gkslx010.igk.intel.com (8.13.6/8.12.8/MailSET/client) with ESMTP id o6FErTE9002341; Thu, 15 Jul 2010 16:53:29 +0200 Subject: [PATCH resend] RDMA/nes: corrected firmware version update To: linux-rdma@vger.kernel.org From: miroslaw.walukiewicz@intel.com Cc: rdreier@cisco.com Date: Thu, 15 Jul 2010 16:53:29 +0200 Message-ID: <20100715144920.1344.27343.stgit@gkslx010.igk.intel.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Jul 2010 14:53:33 +0000 (UTC) diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 0abd4f2..f179586 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -520,7 +520,7 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop memset(props, 0, sizeof(*props)); memcpy(&props->sys_image_guid, nesvnic->netdev->dev_addr, 6); - props->fw_ver = nesdev->nesadapter->fw_ver; + props->fw_ver = nesdev->nesadapter->firmware_version; props->device_cap_flags = nesdev->nesadapter->device_cap_flags; props->vendor_id = nesdev->nesadapter->vendor_id; props->vendor_part_id = nesdev->nesadapter->vendor_part_id;