net/mlx4_en: Move filters cleanup to a proper location

Eugenia Emantayev · davem330 · commit 30f56e3ced0f · 2016-07-19T16:44:11.000-07:00
Filters cleanup should be done once before destroying net device, since filters list is contained in the private data. Fixes: 1eb8c69 ('net/mlx4_en: Add accelerated RFS support') Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2080,6 +2080,10 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 	mdev->upper[priv->port] = NULL;
 	mutex_unlock(&mdev->state_lock);
 
+#ifdef CONFIG_RFS_ACCEL
+	mlx4_en_cleanup_filters(priv);
+#endif
+
 	mlx4_en_free_resources(priv);
 
 	kfree(priv->tx_ring);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -514,9 +514,6 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
 	ring->rx_info = NULL;
 	kfree(ring);
 	*pring = NULL;
-#ifdef CONFIG_RFS_ACCEL
-	mlx4_en_cleanup_filters(priv);
-#endif
 }
 
 void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,

Original file line number	Diff line number	Diff line change
`@@ -514,9 +514,6 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,`
`514`	`514`	`ring->rx_info = NULL;`
`515`	`515`	`kfree(ring);`
`516`	`516`	`*pring = NULL;`
`517`		`-#ifdef CONFIG_RFS_ACCEL`
`518`		`- mlx4_en_cleanup_filters(priv);`
`519`		`-#endif`
`520`	`517`	`}`
`521`	`518`
`522`	`519`	`void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,`