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

Commit 401453a3 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

net/mlx4_core: Fix obscure mlx4_cmd_box parameter in QUERY_DEV_CAP 



The "!mlx4_is_slave" is totally confusing.  Fix with
constant MLX4_CMD_NATIVE, which is the intended behavior.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6230bb23

drivers/net/ethernet/mellanox/mlx4/fw.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	outbox = mailbox->buf;

	outbox = mailbox->buf;





	err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,

	err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,

			   MLX4_CMD_TIME_CLASS_A, !mlx4_is_slave(dev));

			   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);

	if (err)

	if (err)

		goto out;

		goto out;
@@ -590,8 +590,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 




		for (i = 1; i <= dev_cap->num_ports; ++i) {

		for (i = 1; i <= dev_cap->num_ports; ++i) {

			err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,

			err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,

					   MLX4_CMD_TIME_CLASS_B,

					   MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);

					   !mlx4_is_slave(dev));

			if (err)

			if (err)

				goto out;

				goto out;