mlx4_en: Removed redundant cq->armed flag
Subsystems (2)
PATCH 3/9 mlx4_en: Removed redundant cq->armed flag
Signed-off-by Yevgeny Petrilin <[email protected]>
--- drivers/net/mlx4/en_cq.c | 1 - drivers/net/mlx4/en_tx.c | 5 ++--- drivers/net/mlx4/mlx4_en.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-)
drivers/net/mlx4/en_cq.c +0 -1
@@ -140,7 +140,6 @@ int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)int mlx4_en_arm_cq (struct mlx4_en_priv *priv,struct mlx4_en_cq *cq) { - cq->armed =1 ;mlx4_cq_arm (&cq->mcq,MLX4_CQ_DB_REQ_NOT , priv->mdev->uar_map, &priv->mdev->uar_lock);
drivers/net/mlx4/en_tx.c +2 -3
@@ -379,8 +379,8 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)/* Wakeup Tx queue if this ring stopped it */ if (unlikely (ring->blocked)) { -if (((u32) (ring->prod - ring->cons) <= - ring->size -HEADROOM -MAX_DESC_TXBBS ) && !cq->armed) { +if ((u32) (ring->prod - ring->cons) <= + ring->size -HEADROOM -MAX_DESC_TXBBS ) {/* TODO: support multiqueue netdevs. Currently, we block * when *any* ring is full. Note that:
@@ -404,7 +404,6 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq)struct mlx4_en_priv *priv =netdev_priv (cq->dev);struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring]; - cq->armed =0 ;if (!spin_trylock (&ring->comp_lock))return ;mlx4_en_process_tx_cq (cq->dev, cq);
drivers/net/mlx4/mlx4_en.h +0 -1
@@ -311,7 +311,6 @@ struct mlx4_en_cq {enum cq_type is_tx;u16 moder_time;u16 moder_cnt; -int armed;struct mlx4_cqe *buf;#define MLX4_EN_OPCODE_ERROR 0x1e };
Signature · 1 line
1.5.4
From: Yevgeny Petrilin <[email protected]>
Date: Mon, 22 Dec 2008 12:00:31 +0200
Quoted 1 line
Signed-off-by Yevgeny Petrilin <[email protected]>
Applied.