summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-02 11:18:48 +0400
committerDavid S. Miller <davem@davemloft.net>2014-06-02 11:18:48 +0400
commit96b2e73c5471542cb9c622c4360716684f8797ed (patch)
tree8afddc81c11b89232a32ade9f51d25619de337fb /drivers/net/ethernet/mellanox/mlx4/en_netdev.c
parentd64eed1d9bb57fb7a8daf9b6127dd8b558e6d262 (diff)
downloadlinux-96b2e73c5471542cb9c622c4360716684f8797ed.tar.xz
Revert "net/mlx4_en: Use affinity hint"
This reverts commit 70a640d0dae3a9b1b222ce673eb5d92c263ddd61. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_netdev.c')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_netdev.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 05d135572abc..58209bd0c94c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1526,32 +1526,6 @@ static void mlx4_en_linkstate(struct work_struct *work)
mutex_unlock(&mdev->state_lock);
}
-static void mlx4_en_init_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)
-{
- struct mlx4_en_rx_ring *ring = priv->rx_ring[ring_idx];
- int numa_node = priv->mdev->dev->numa_node;
-
- if (numa_node == -1)
- return;
-
- if (!zalloc_cpumask_var(&ring->affinity_mask, GFP_KERNEL)) {
- en_err(priv, "Failed to allocate core mask\n");
- return;
- }
-
- if (cpumask_set_cpu_local_first(ring_idx, numa_node,
- ring->affinity_mask)) {
- en_err(priv, "Failed setting affinity hint\n");
- free_cpumask_var(ring->affinity_mask);
- ring->affinity_mask = NULL;
- }
-}
-
-static void mlx4_en_free_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)
-{
- free_cpumask_var(priv->rx_ring[ring_idx]->affinity_mask);
- priv->rx_ring[ring_idx]->affinity_mask = NULL;
-}
int mlx4_en_start_port(struct net_device *dev)
{
@@ -1593,8 +1567,6 @@ int mlx4_en_start_port(struct net_device *dev)
mlx4_en_cq_init_lock(cq);
- mlx4_en_init_affinity_hint(priv, i);
-
err = mlx4_en_activate_cq(priv, cq, i);
if (err) {
en_err(priv, "Failed activating Rx CQ\n");
@@ -1875,8 +1847,6 @@ void mlx4_en_stop_port(struct net_device *dev, int detach)
msleep(1);
mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);
mlx4_en_deactivate_cq(priv, cq);
-
- mlx4_en_free_affinity_hint(priv, i);
}
}