From patchwork Thu Jan 9 22:48:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Upinder Malhi (umalhi)" X-Patchwork-Id: 3463591 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AF6F2C02DC for ; Thu, 9 Jan 2014 22:48:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6AEC2010B for ; Thu, 9 Jan 2014 22:48:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C63620103 for ; Thu, 9 Jan 2014 22:48:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756540AbaAIWsc (ORCPT ); Thu, 9 Jan 2014 17:48:32 -0500 Received: from mtv-iport-1.cisco.com ([173.36.130.12]:49152 "EHLO mtv-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756598AbaAIWsV (ORCPT ); Thu, 9 Jan 2014 17:48:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1694; q=dns/txt; s=iport; t=1389307702; x=1390517302; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=6vJ9hgF+/knNSrNZ2+KG9Xa+zDqFjUTT9Dzez8nJPZk=; b=L5bTxBxvEwClLkBi3bELOASJXgpwVjk0JaS5ZsdmNhqL/eq4w9/waEWp ucZU/8H86nI7VvuNwEh8LavAgKrN+l0WaWjeJG1EC+Q0M+ClZCwB+dEfd 6qGUM85KqSNMMmt/1FYAcdB6QICevZyN9U7j4mLQ8+VKcQsYdgzw+UgmU E=; X-IronPort-AV: E=Sophos;i="4.95,634,1384300800"; d="scan'208";a="99229752" Received: from mtv-core-4.cisco.com ([171.68.58.9]) by mtv-iport-1.cisco.com with ESMTP; 09 Jan 2014 22:48:20 +0000 Received: from sjc-savbu-bld03.cisco.com (sjc-savbu-bld03.cisco.com [171.71.188.58]) by mtv-core-4.cisco.com (8.14.5/8.14.5) with ESMTP id s09MmCsD011823; Thu, 9 Jan 2014 22:48:19 GMT Received: by sjc-savbu-bld03.cisco.com (Postfix, from userid 246720) id 973C03F7E7; Thu, 9 Jan 2014 14:48:11 -0800 (PST) From: Upinder Malhi To: linux-rdma@vger.kernel.org, roland@kernel.org Cc: Upinder Malhi Subject: [PATCH v1 for-next 5/5] IB/usnic: Port over sysfs to new usnic_fwd.h Date: Thu, 9 Jan 2014 14:48:10 -0800 Message-Id: <1389307690-11493-6-git-send-email-umalhi@cisco.com> X-Mailer: git-send-email 1.8.0-rc0 In-Reply-To: <1389307690-11493-1-git-send-email-umalhi@cisco.com> References: <1389307690-11493-1-git-send-email-umalhi@cisco.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch ports usnic_ib_sysfs.c to the new interface of usnic_fwd.h. Signed-off-by: Upinder Malhi --- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c index bad985e..3e58842 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c @@ -104,7 +104,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr, PCI_SLOT(us_ibdev->pdev->devfn), PCI_FUNC(us_ibdev->pdev->devfn), netdev_name(us_ibdev->netdev), - us_ibdev->mac, + us_ibdev->ufdev->mac, atomic_read(&us_ibdev->vf_cnt.refcount)); UPDATE_PTR_LEFT(n, ptr, left); @@ -239,21 +239,17 @@ static ssize_t summary_show(struct usnic_ib_qp_grp *qp_grp, char *buf) int left; char *ptr; struct usnic_vnic_res_chunk *res_chunk; - struct usnic_fwd_filter_hndl *default_filter_hndl; struct usnic_vnic_res *vnic_res; left = PAGE_SIZE; ptr = buf; - default_filter_hndl = list_first_entry(&qp_grp->filter_hndls, - struct usnic_fwd_filter_hndl, link); n = scnprintf(ptr, left, - "QPN: %d State: (%s) PID: %u VF Idx: %hu Filter ID: 0x%x ", + "QPN: %d State: (%s) PID: %u VF Idx: %hu ", qp_grp->ibqp.qp_num, usnic_ib_qp_grp_state_to_string(qp_grp->state), qp_grp->owner_pid, - usnic_vnic_get_index(qp_grp->vf->vnic), - default_filter_hndl->id); + usnic_vnic_get_index(qp_grp->vf->vnic)); UPDATE_PTR_LEFT(n, ptr, left); for (i = 0; qp_grp->res_chunk_list[i]; i++) {