Commit 2f1f5a77 authored Jul 11, 2019 by Saeed Mahameed Committed by David S. Miller Jul 11, 2019

net/mlx5e: Fix unused variable warning when CONFIG_MLX5_ESWITCH is off



In mlx5e_setup_tc "priv" variable is not being used if
CONFIG_MLX5_ESWITCH is off, one way to fix this is to actually use it.

mlx5e_setup_tc_mqprio also needs the "priv" variable and it extracts it
on its own. We can simply pass priv to mlx5e_setup_tc_mqprio instead of
netdev and avoid extracting the priv var, which will also resolve the
compiler warning.

Fixes: 4e95bc26 ("net: flow_offload: add flow_block_cb_setup_simple()")
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
CC: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c93dfec1

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -3390,10 +3390,9 @@ static int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd)
		return 0;
		}

		static int mlx5e_setup_tc_mqprio(struct net_device *netdev,
		static int mlx5e_setup_tc_mqprio(struct mlx5e_priv *priv,
		struct tc_mqprio_qopt *mqprio)
		{
		struct mlx5e_priv *priv = netdev_priv(netdev);
		struct mlx5e_channels new_channels = {};
		u8 tc = mqprio->num_tc;
		int err = 0;
		@@ -3475,7 +3474,7 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type,
		priv, priv, true);
		#endif
		case TC_SETUP_QDISC_MQPRIO:
		return mlx5e_setup_tc_mqprio(dev, type_data);
		return mlx5e_setup_tc_mqprio(priv, type_data);
		default:
		return -EOPNOTSUPP;
		}

Admin message