summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUpinder Malhi <umalhi@cisco.com>2014-01-09 14:48:10 -0800
committerRoland Dreier <roland@purestorage.com>2014-01-14 00:44:42 -0800
commit60b215e8b267f911751a043de63181dab1b69706 (patch)
treefaa7429765844cfa7741675dd766e717c8da336b
parent256d6a6ac52ee02e897cec88ecc96c3ae7f9cb88 (diff)
IB/usnic: Port over sysfs to new usnic_fwd.h
This patch ports usnic_ib_sysfs.c to the new interface of usnic_fwd.h. Signed-off-by: Upinder Malhi <umalhi@cisco.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--drivers/infiniband/hw/usnic/usnic_ib_sysfs.c10
1 files 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 bad985e9df0..3e588423234 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++) {