renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code

net/mlx4_en: Initialize RFS filters lock and list in init_netdev

Browse Source 
filters_lock might have been used while it was re-initialized.
Moved filters_lock and filters_list initialization to init_netdev instead of
alloc_resources which is called every time the device is configured.

Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amir Vadai 2013-01-24 01:54:19 +00:00 committed by David S. Miller
parent 7225922558
commit 78fb2de711
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
View File

@ -1454,9 +1454,6 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->rx_ring_num); priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->rx_ring_num);
if (!priv->dev->rx_cpu_rmap) if (!priv->dev->rx_cpu_rmap)
goto err; goto err;
INIT_LIST_HEAD(&priv->filters);
spin_lock_init(&priv->filters_lock);
#endif #endif
return 0; return 0;
@ -1651,6 +1648,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
if (err) if (err)
goto out; goto out;
#ifdef CONFIG_RFS_ACCEL
INIT_LIST_HEAD(&priv->filters);
spin_lock_init(&priv->filters_lock);
#endif
/* Allocate page for receive rings */ /* Allocate page for receive rings */
err = mlx4_alloc_hwq_res(mdev->dev, &priv->res, err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE); MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);