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

Commit bc82878b authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

mlx4_core: Fix incorrect FLAGS1 bitmap test in mlx4_QUERY_FUNC_CAP 



Commit eb17711b ("net/mlx4_core: Introduce nic_info new flag in
QUERY_FUNC_CAP") did:

	if (func_cap->flags1 & QUERY_FUNC_CAP_FLAGS1_OFFSET) {

which should be:

	if (func_cap->flags1 & QUERY_FUNC_CAP_FLAGS1_FORCE_VLAN) {

Fix that.

Fixes: eb17711b ("net/mlx4_core: Introduce nic_info new flag in QUERY_FUNC_CAP")
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent b38f2879

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -414,7 +414,7 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port, 




	MLX4_GET(func_cap->flags1, outbox, QUERY_FUNC_CAP_FLAGS1_OFFSET);

	MLX4_GET(func_cap->flags1, outbox, QUERY_FUNC_CAP_FLAGS1_OFFSET);

	if (dev->caps.port_type[gen_or_port] == MLX4_PORT_TYPE_ETH) {

	if (dev->caps.port_type[gen_or_port] == MLX4_PORT_TYPE_ETH) {

		if (func_cap->flags1 & QUERY_FUNC_CAP_FLAGS1_OFFSET) {

		if (func_cap->flags1 & QUERY_FUNC_CAP_FLAGS1_FORCE_VLAN) {

			mlx4_err(dev, "VLAN is enforced on this port\n");

			mlx4_err(dev, "VLAN is enforced on this port\n");

			err = -EPROTONOSUPPORT;

			err = -EPROTONOSUPPORT;

			goto out;

			goto out;