From dcb732bf4ade6e34dd625848255e1ee872d052b8 Mon Sep 17 00:00:00 2001
From: Amir Vadai <amirv@mellanox.com>
Date: Thu, 24 Jan 2013 01:54:19 +0000
Subject: [PATCH] --- yaml --- r: 351675 b: refs/heads/master c:
 78fb2de711ec28997bf38bcf3e48e108e907be77 h: refs/heads/master i:   351673:
 aff8d177da2cbf262ed170840b88a615282db0f5   351671:
 4301c6414d75e17e18dbc7671219abfdec6b8263 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4be53863a89b..12f7094ac6c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7225922558f04f25a22683ce08454dae8dd4b9f4
+refs/heads/master: 78fb2de711ec28997bf38bcf3e48e108e907be77
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 805e24233b1b..9c42812d2f6b 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -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);
 	if (!priv->dev->rx_cpu_rmap)
 		goto err;
-
-	INIT_LIST_HEAD(&priv->filters);
-	spin_lock_init(&priv->filters_lock);
 #endif
 
 	return 0;
@@ -1651,6 +1648,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 	if (err)
 		goto out;
 
+#ifdef CONFIG_RFS_ACCEL
+	INIT_LIST_HEAD(&priv->filters);
+	spin_lock_init(&priv->filters_lock);
+#endif
+
 	/* Allocate page for receive rings */
 	err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
 				MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);