diff options
author | Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2008-12-25 21:14:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-25 21:14:04 -0500 |
commit | c03ea21fcf549eed42de7aaa965ced8bee17aa76 (patch) | |
tree | 40fa6ddb2baa7ee8715d5f7c4d43549cbc5c9489 /drivers/net/mlx4/en_tx.c | |
parent | 48374ddce72e278e29080e3177e74a13c034d8b4 (diff) |
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) | |||
379 | 379 | ||
380 | /* Wakeup Tx queue if this ring stopped it */ | 380 | /* Wakeup Tx queue if this ring stopped it */ |
381 | if (unlikely(ring->blocked)) { | 381 | if (unlikely(ring->blocked)) { |
382 | if (((u32) (ring->prod - ring->cons) <= | 382 | if ((u32) (ring->prod - ring->cons) <= |
383 | ring->size - HEADROOM - MAX_DESC_TXBBS) && !cq->armed) { | 383 | ring->size - HEADROOM - MAX_DESC_TXBBS) { |
384 | 384 | ||
385 | /* TODO: support multiqueue netdevs. Currently, we block | 385 | /* TODO: support multiqueue netdevs. Currently, we block |
386 | * when *any* ring is full. Note that: | 386 | * when *any* ring is full. Note that: |
@@ -404,7 +404,6 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq) | |||
404 | struct mlx4_en_priv *priv = netdev_priv(cq->dev); | 404 | struct mlx4_en_priv *priv = netdev_priv(cq->dev); |
405 | struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring]; | 405 | struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring]; |
406 | 406 | ||
407 | cq->armed = 0; | ||
408 | if (!spin_trylock(&ring->comp_lock)) | 407 | if (!spin_trylock(&ring->comp_lock)) |
409 | return; | 408 | return; |
410 | mlx4_en_process_tx_cq(cq->dev, cq); | 409 | mlx4_en_process_tx_cq(cq->dev, cq); |