| From adb7afac2be265fa76edac2691a1bdc6f8df365d Mon Sep 17 00:00:00 2001 |
| From: Eli Cohen <eli@mellanox.com> |
| Date: Wed, 28 Dec 2016 14:58:34 +0200 |
| Subject: [PATCH] net/mlx5: Avoid shadowing numa_node |
| |
| commit d151d73dcc99de87c63bdefebcc4cb69de1cdc40 upstream. |
| |
| Avoid using a local variable named numa_node to avoid shadowing a public |
| one. |
| |
| Fixes: db058a186f98 ('net/mlx5_core: Set irq affinity hints') |
| Signed-off-by: Eli Cohen <eli@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| index 35307e2e0cab..ed2cc34c8e6b 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -586,7 +586,6 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) |
| struct mlx5_priv *priv = &mdev->priv; |
| struct msix_entry *msix = priv->msix_arr; |
| int irq = msix[i + MLX5_EQ_VEC_COMP_BASE].vector; |
| - int numa_node = priv->numa_node; |
| int err; |
| |
| if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) { |
| @@ -594,7 +593,7 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) |
| return -ENOMEM; |
| } |
| |
| - cpumask_set_cpu(cpumask_local_spread(i, numa_node), |
| + cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node), |
| priv->irq_info[i].mask); |
| |
| err = irq_set_affinity_hint(irq, priv->irq_info[i].mask); |
| -- |
| 2.10.1 |
| |
