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

Commit 5930e8d0 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx4: Fix typo, move similar defs to same location 



Small code cleanup:

1. change MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN to MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN

2. put MLX4_SET_PORT_PRIO2TC and MLX4_SET_PORT_SCHEDULER in the same union with the
   other MLX4_SET_PORT_yyy

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe66bb2d

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

+1 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,7 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 


	/* Unregister Mac address for the port */

	mlx4_en_put_qp(priv);

	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))

	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN))

		mdev->mac_removed[priv->port] = 1;



	/* Free RX Rings */

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

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		 QUERY_DEV_CAP_RSVD_LKEY_OFFSET);

	MLX4_GET(field, outbox, QUERY_DEV_CAP_FW_REASSIGN_MAC);

	if (field & 1<<6)

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN;

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN;

	MLX4_GET(dev_cap->max_icm_sz, outbox,

		 QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);

	if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)

include/linux/mlx4/cmd.h

+2 −4
Original line number Diff line number Diff line
@@ -154,10 +154,6 @@ enum { 
	MLX4_CMD_QUERY_IF_STAT	 = 0X54,

	MLX4_CMD_SET_IF_STAT	 = 0X55,



	/* set port opcode modifiers */

	MLX4_SET_PORT_PRIO2TC = 0x8,

	MLX4_SET_PORT_SCHEDULER  = 0x9,



	/* register/delete flow steering network rules */

	MLX4_QP_FLOW_STEERING_ATTACH = 0x65,

	MLX4_QP_FLOW_STEERING_DETACH = 0x66,
@@ -182,6 +178,8 @@ enum { 
	MLX4_SET_PORT_VLAN_TABLE = 0x3,

	MLX4_SET_PORT_PRIO_MAP  = 0x4,

	MLX4_SET_PORT_GID_TABLE = 0x5,

	MLX4_SET_PORT_PRIO2TC	= 0x8,

	MLX4_SET_PORT_SCHEDULER = 0x9,

};



enum {

include/linux/mlx4/device.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ enum { 
	MLX4_DEV_CAP_FLAG2_RSS_TOP		= 1LL <<  1,

	MLX4_DEV_CAP_FLAG2_RSS_XOR		= 1LL <<  2,

	MLX4_DEV_CAP_FLAG2_FS_EN		= 1LL <<  3,

	MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN	= 1LL <<  4,

	MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN	= 1LL <<  4,

	MLX4_DEV_CAP_FLAG2_TS			= 1LL <<  5,

	MLX4_DEV_CAP_FLAG2_VLAN_CONTROL		= 1LL <<  6,

	MLX4_DEV_CAP_FLAG2_FSM			= 1LL <<  7,