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

Commit 225c6c8c authored by Matan Barak's avatar Matan Barak Committed by David S. Miller
Browse files

net/mlx4_core: Use correct variable type for mlx4_slave_cap 



We've used an incorrect type for the loop counter and the
mlx4_QUERY_FUNC_CAP function. The current input modifier
is either a port or a boolean.
Since the number of ports is always a positive value < 255,
we should use u8 instead of an integer with casting.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c68dd43

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

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	return err;

}



int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,

int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u8 gen_or_port,

			struct mlx4_func_cap *func_cap)

{

	struct mlx4_cmd_mailbox *mailbox;

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

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct mlx4_set_ib_param { 
};



int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap);

int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,

int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u8 gen_or_port,

			struct mlx4_func_cap *func_cap);

int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,

				struct mlx4_vhcr *vhcr,

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

+2 −2
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
	struct mlx4_dev_cap	   dev_cap;

	struct mlx4_func_cap	   func_cap;

	struct mlx4_init_hca_param hca_param;

	int			   i;

	u8			   i;



	memset(&hca_param, 0, sizeof(hca_param));

	err = mlx4_QUERY_HCA(dev, &hca_param);
@@ -732,7 +732,7 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
	}



	for (i = 1; i <= dev->caps.num_ports; ++i) {

		err = mlx4_QUERY_FUNC_CAP(dev, (u32) i, &func_cap);

		err = mlx4_QUERY_FUNC_CAP(dev, i, &func_cap);

		if (err) {

			mlx4_err(dev, "QUERY_FUNC_CAP port command failed for port %d, aborting (%d)\n",

				 i, err);