diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-04-02 19:57:31 +0200 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-04-02 19:57:31 +0200 |
| commit | 0559d8dc13a1cd68b5e64c0b61659f36c7b5c89f (patch) | |
| tree | 680c2516ac8f6a6114ca35ade2a2ab341449c686 /drivers/infiniband | |
| parent | IB/mlx4: Don't return an invalid speed when a port is down (diff) | |
| download | linux-0559d8dc13a1cd68b5e64c0b61659f36c7b5c89f.tar.xz linux-0559d8dc13a1cd68b5e64c0b61659f36c7b5c89f.zip | |
IB/core: Don't return EINVAL from sysfs rate attribute for invalid speeds
Commit e9319b0cb00d ("IB/core: Fix SDR rates in sysfs") changed our
sysfs rate attribute to return EINVAL to userspace if the underlying
device driver returns an invalid rate. Apparently some drivers do this
when the link is down and some userspace pukes if it gets an error when
reading this attribute, so avoid a regression by not return an error to
match the old code.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/core/sysfs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index 83b720ef6c34..246fdc151652 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -179,7 +179,7 @@ static ssize_t rate_show(struct ib_port *p, struct port_attribute *unused, { struct ib_port_attr attr; char *speed = ""; - int rate = -1; /* in deci-Gb/sec */ + int rate; /* in deci-Gb/sec */ ssize_t ret; ret = ib_query_port(p->ibdev, p->port_num, &attr); @@ -187,9 +187,6 @@ static ssize_t rate_show(struct ib_port *p, struct port_attribute *unused, return ret; switch (attr.active_speed) { - case IB_SPEED_SDR: - rate = 25; - break; case IB_SPEED_DDR: speed = " DDR"; rate = 50; @@ -210,6 +207,10 @@ static ssize_t rate_show(struct ib_port *p, struct port_attribute *unused, speed = " EDR"; rate = 250; break; + case IB_SPEED_SDR: + default: /* default to SDR for invalid rates */ + rate = 25; + break; } rate *= ib_width_enum_to_int(attr.active_width); |