aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEli Cohen <eli@mellanox.com>2016-12-28 07:58:34 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-15 07:42:53 -0500
commitefbbc75c00fc15598cd863dfe117dfa976e8b971 (patch)
tree4ad0da9dd2616ea8e4c5381fdcde2f56084f21d2 /drivers
parentca8a64467f2a20f86218c483c03fb7fc8c33c156 (diff)
net/mlx5: Avoid shadowing numa_node
[ Upstream commit d151d73dcc99de87c63bdefebcc4cb69de1cdc40 ] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 15b7e600bf9b..92bd13ddc39d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -547,7 +547,6 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
547 struct mlx5_priv *priv = &mdev->priv; 547 struct mlx5_priv *priv = &mdev->priv;
548 struct msix_entry *msix = priv->msix_arr; 548 struct msix_entry *msix = priv->msix_arr;
549 int irq = msix[i + MLX5_EQ_VEC_COMP_BASE].vector; 549 int irq = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
550 int numa_node = priv->numa_node;
551 int err; 550 int err;
552 551
553 if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) { 552 if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) {
@@ -555,7 +554,7 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
555 return -ENOMEM; 554 return -ENOMEM;
556 } 555 }
557 556
558 cpumask_set_cpu(cpumask_local_spread(i, numa_node), 557 cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node),
559 priv->irq_info[i].mask); 558 priv->irq_info[i].mask);
560 559
561 err = irq_set_affinity_hint(irq, priv->irq_info[i].mask); 560 err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);