Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c03ea21f authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

mlx4_en: Removed redundant cq->armed flag 



Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48374ddc

drivers/net/mlx4/en_cq.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

};