Commit e3391054 authored by Achiad Shochat's avatar Achiad Shochat Committed by David S. Miller

net/mlx5e: Remove mlx5e_cq.sqrq back-pointer

Use container_of() instead.
Signed-off-by: default avatarAchiad Shochat <achiad@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ca56ce3
...@@ -208,7 +208,6 @@ enum cq_flags { ...@@ -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 */
......
...@@ -853,8 +853,6 @@ static int mlx5e_open_tx_cqs(struct mlx5e_channel *c, ...@@ -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, ...@@ -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);
......
...@@ -191,7 +191,7 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, ...@@ -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 */
......
...@@ -266,7 +266,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq) ...@@ -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;
......
...@@ -65,7 +65,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment