Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 21:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/mlx5e: Remove mlx5e_cq.sqrq back-pointer

Browse Source 
Use container_of() instead.

Signed-off-by: Achiad Shochat <achiad@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Achiad Shochat 2015-06-23 17:14:20 +03:00 committed by David S. Miller
parent 8ca56ce39d
commit e33910548a
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/mellanox/mlx5/core/en.h
View File

@ -208,7 +208,6 @@ enum cq_flags {
struct mlx5e_cq { struct mlx5e_cq {
/* data path - accessed per cqe */ /* data path - accessed per cqe */
struct mlx5_cqwq wq; struct mlx5_cqwq wq;
void *sqrq;
unsigned long flags; unsigned long flags;
/* data path - accessed per napi poll */ /* data path - accessed per napi poll */

3
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View File

@ -853,8 +853,6 @@ static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,
priv->params.tx_cq_moderation_pkts); priv->params.tx_cq_moderation_pkts);
if (err) if (err)
goto err_close_tx_cqs; goto err_close_tx_cqs;
c->sq[tc].cq.sqrq = &c->sq[tc];
} }
return 0; return 0;
@ -946,7 +944,6 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
priv->params.rx_cq_moderation_pkts); priv->params.rx_cq_moderation_pkts);
if (err) if (err)
goto err_close_tx_cqs; goto err_close_tx_cqs;
c->rq.cq.sqrq = &c->rq;
napi_enable(&c->napi); napi_enable(&c->napi);

2
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
View File

@ -191,7 +191,7 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,
bool mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) bool mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
{ {
struct mlx5e_rq *rq = cq->sqrq; struct mlx5e_rq *rq = container_of(cq, struct mlx5e_rq, cq);
int i; int i;
/* avoid accessing cq (dma coherent memory) if not needed */ /* avoid accessing cq (dma coherent memory) if not needed */

2
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
View File

@ -266,7 +266,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
if (!test_and_clear_bit(MLX5E_CQ_HAS_CQES, &cq->flags)) if (!test_and_clear_bit(MLX5E_CQ_HAS_CQES, &cq->flags))
return false; return false;
sq = cq->sqrq; sq = container_of(cq, struct mlx5e_sq, cq);
npkts = 0; npkts = 0;
nbytes = 0; nbytes = 0;

2
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
View File

@ -65,7 +65,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
busy |= mlx5e_poll_rx_cq(&c->rq.cq, budget); busy |= mlx5e_poll_rx_cq(&c->rq.cq, budget);
busy |= mlx5e_post_rx_wqes(c->rq.cq.sqrq); busy |= mlx5e_post_rx_wqes(&c->rq);
if (busy) if (busy)
return budget; return budget;