diff options
| author |   Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2008-12-25 18:14:04 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-12-25 18:14:04 -0800 |
| commit | c03ea21fcf549eed42de7aaa965ced8bee17aa76 (patch) | |
| tree | 40fa6ddb2baa7ee8715d5f7c4d43549cbc5c9489 /drivers/net/mlx4/en_tx.c | |
| parent | mlx4_en: Removed TX locking when polling TX cq (diff) | |
| download | linux-dev-c03ea21fcf549eed42de7aaa965ced8bee17aa76.tar.xz linux-dev-c03ea21fcf549eed42de7aaa965ced8bee17aa76.zip | |
mlx4_en: Removed redundant cq->armed flag
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4/en_tx.c')
| -rw-r--r-- | drivers/net/mlx4/en_tx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 1f25821dccfd..ff4d75205c25 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c @@ -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); |