Skip to content

Commit

Permalink
IB/core: Specify attribute_id in port_table_attribute
Browse files Browse the repository at this point in the history
Add the attr_id on port_table_attribute since we will have to add
a different port_table_attribute for the extended attribute soon.

Reviewed-by: Hal Rosenstock <hal@mellanox.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
  • Loading branch information
Christoph Lameter authored and Doug Ledford committed Dec 23, 2015
1 parent 35c4cbb commit b2788ce
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/infiniband/core/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <linux/netdevice.h>

#include <rdma/ib_mad.h>
#include <rdma/ib_pma.h>

struct ib_port;

Expand Down Expand Up @@ -75,6 +76,7 @@ struct port_table_attribute {
struct port_attribute attr;
char name[8];
int index;
int attr_id;
};

static ssize_t port_attr_show(struct kobject *kobj,
Expand Down Expand Up @@ -395,7 +397,8 @@ static ssize_t show_port_pkey(struct ib_port *p, struct port_attribute *attr,
#define PORT_PMA_ATTR(_name, _counter, _width, _offset) \
struct port_table_attribute port_pma_attr_##_name = { \
.attr = __ATTR(_name, S_IRUGO, show_pma_counter, NULL), \
.index = (_offset) | ((_width) << 16) | ((_counter) << 24) \
.index = (_offset) | ((_width) << 16) | ((_counter) << 24), \
.attr_id = IB_PMA_PORT_COUNTERS , \
}

/*
Expand Down Expand Up @@ -457,7 +460,7 @@ static ssize_t show_pma_counter(struct ib_port *p, struct port_attribute *attr,
ssize_t ret;
u8 data[8];

ret = get_perf_mad(p->ibdev, p->port_num, cpu_to_be16(0x12), &data,
ret = get_perf_mad(p->ibdev, p->port_num, tab_attr->attr_id, &data,
40 + offset / 8, sizeof(data));
if (ret < 0)
return sprintf(buf, "N/A (no PMA)\n");
Expand Down

0 comments on commit b2788ce

Please sign in to comment.