3 files changed, 1 insertions, 7 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index 70e95324a97d..c2cd8d31bcad 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -66,7 +66,6 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
 
         cq->ring = ring;
         cq->is_tx = mode;
-        spin_lock_init(&cq->lock);
 
         /* Allocate HW buffers on provided NUMA node.
          * dev->numa_node is used in mtt range allocation flow.
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index f085c2df5e69..7e4b1720c3d1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1304,15 +1304,11 @@ static void mlx4_en_netpoll(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_cq *cq;
-        unsigned long flags;
         int i;
 
         for (i = 0; i < priv->rx_ring_num; i++) {
                 cq = priv->rx_cq[i];
-                spin_lock_irqsave(&cq->lock, flags);
-                napi_synchronize(&cq->napi);
-                mlx4_en_process_rx_cq(dev, cq, 0);
-                spin_unlock_irqrestore(&cq->lock, flags);
+                napi_schedule(&cq->napi);
         }
 }
 #endif
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 7a733c287744..04d9b6fe3e80 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -319,7 +319,6 @@ struct mlx4_en_cq {
         struct mlx4_cq          mcq;
         struct mlx4_hwq_resources wqres;
         int                     ring;
-        spinlock_t              lock;
         struct net_device      *dev;
         struct napi_struct      napi;
         int size;