[PATCH v2 net-next 02/14] mlx4: mlx4_en_low_latency_recv() called with BH disabled

[Eric Dumazet]

mlx4_en_low_latency_recv() is called with BH disabled,
as other ndo_busy_poll() methods.

No need for spin_lock_bh()/spin_unlock_bh()

Signed-off-by: Eric Dumazet <eduma...@google.com>
---
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h 
b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index c41f15102ae0..965c8f016ac4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -660,11 +660,12 @@ static inline bool mlx4_en_cq_unlock_napi(struct 
mlx4_en_cq *cq)
        return rc;
 }
 
-/* called from mlx4_en_low_latency_poll() */
+/* called from mlx4_en_low_latency_recv(), BH are disabled */
 static inline bool mlx4_en_cq_lock_poll(struct mlx4_en_cq *cq)
 {
        int rc = true;
-       spin_lock_bh(&cq->poll_lock);
+
+       spin_lock(&cq->poll_lock);
        if ((cq->state & MLX4_CQ_LOCKED)) {
                struct net_device *dev = cq->dev;
                struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -676,7 +677,7 @@ static inline bool mlx4_en_cq_lock_poll(struct mlx4_en_cq 
*cq)
        } else
                /* preserve yield marks */
                cq->state |= MLX4_EN_CQ_STATE_POLL;
-       spin_unlock_bh(&cq->poll_lock);
+       spin_unlock(&cq->poll_lock);
        return rc;
 }
 
@@ -684,13 +685,14 @@ static inline bool mlx4_en_cq_lock_poll(struct mlx4_en_cq 
*cq)
 static inline bool mlx4_en_cq_unlock_poll(struct mlx4_en_cq *cq)
 {
        int rc = false;
-       spin_lock_bh(&cq->poll_lock);
+
+       spin_lock(&cq->poll_lock);
        WARN_ON(cq->state & (MLX4_EN_CQ_STATE_NAPI));
 
        if (cq->state & MLX4_EN_CQ_STATE_POLL_YIELD)
                rc = true;
        cq->state = MLX4_EN_CQ_STATE_IDLE;
-       spin_unlock_bh(&cq->poll_lock);
+       spin_unlock(&cq->poll_lock);
        return rc;
 }
 
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html