UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Yevgeny Petrilin 2008-12-25 18:14:04 -08:00 committed by David S. Miller
parent 48374ddce7
commit c03ea21fcf
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/mlx4/en_cq.c
View File

@ -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) 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, mlx4_cq_arm(&cq->mcq, MLX4_CQ_DB_REQ_NOT, priv->mdev->uar_map,
&priv->mdev->uar_lock); &priv->mdev->uar_lock);

5
drivers/net/mlx4/en_tx.c
View File

@ -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 */ /* Wakeup Tx queue if this ring stopped it */
if (unlikely(ring->blocked)) { if (unlikely(ring->blocked)) {
if (((u32) (ring->prod - ring->cons) <= if ((u32) (ring->prod - ring->cons) <=
ring->size - HEADROOM - MAX_DESC_TXBBS) && !cq->armed) { ring->size - HEADROOM - MAX_DESC_TXBBS) {
/* TODO: support multiqueue netdevs. Currently, we block /* TODO: support multiqueue netdevs. Currently, we block
* when *any* ring is full. Note that: * 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_priv *priv = netdev_priv(cq->dev);
struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring]; struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
cq->armed = 0;
if (!spin_trylock(&ring->comp_lock)) if (!spin_trylock(&ring->comp_lock))
return; return;
mlx4_en_process_tx_cq(cq->dev, cq); mlx4_en_process_tx_cq(cq->dev, cq);

1
drivers/net/mlx4/mlx4_en.h
View File

@ -311,7 +311,6 @@ struct mlx4_en_cq {
enum cq_type is_tx; enum cq_type is_tx;
u16 moder_time; u16 moder_time;
u16 moder_cnt; u16 moder_cnt;
int armed;
struct mlx4_cqe *buf; struct mlx4_cqe *buf;
#define MLX4_EN_OPCODE_ERROR 0x1e #define MLX4_EN_OPCODE_ERROR 0x1e
}; };