| Message ID | 20180103224022.3737385-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 74bd5d56bfcb857abb5ae7d9f47933be9d288cbd |
| Headers | show |
| Series | net/mlx5e: hide an unused variable | expand |
On 1/3/2018 2:40 PM, Arnd Bergmann wrote: > The uplink_rpriv variable was added at the start of the function but > only used inside of an #ifdef: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c: In function 'mlx5e_route_lookup_ipv6': > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:1549:25: error: unused variable 'uplink_rpriv' [-Werror=unused-variable] > > This moves the declaration into that #ifdef as well. > > Fixes: 5ed99fb421d4 ("net/mlx5e: Move ethernet representors data into separate struct") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Saeed Mahameed <saeedm@mellanox.com> Thank you Arnd.
From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 3 Jan 2018 23:40:11 +0100 > The uplink_rpriv variable was added at the start of the function but > only used inside of an #ifdef: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c: In function 'mlx5e_route_lookup_ipv6': > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:1549:25: error: unused variable 'uplink_rpriv' [-Werror=unused-variable] > > This moves the declaration into that #ifdef as well. > > Fixes: 5ed99fb421d4 ("net/mlx5e: Move ethernet representors data into separate struct") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied. Please make it clear which tree you are targetting in your Subject lines in the future. This should have been "[PATCH net-next] ...".
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 25a8073f15d8..933275fe03b2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1546,11 +1546,11 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, struct neighbour **out_n, int *out_ttl) { - struct mlx5e_rep_priv *uplink_rpriv; struct neighbour *n = NULL; struct dst_entry *dst; #if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) + struct mlx5e_rep_priv *uplink_rpriv; struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; int ret;
The uplink_rpriv variable was added at the start of the function but only used inside of an #ifdef: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c: In function 'mlx5e_route_lookup_ipv6': drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:1549:25: error: unused variable 'uplink_rpriv' [-Werror=unused-variable] This moves the declaration into that #ifdef as well. Fixes: 5ed99fb421d4 ("net/mlx5e: Move ethernet representors data into separate struct") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0