Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0559d8dc authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/core: Don't return EINVAL from sysfs rate attribute for invalid speeds 



Commit e9319b0c ("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: default avatarRoland Dreier <roland@purestorage.com>
parent d2ef4068

drivers/infiniband/core/sysfs.c

+5 −4
Original line number Diff line number Diff line
@@ -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);