Commit 48b9ce0a authored by Gur Stavi's avatar Gur Stavi Committed by Jakub Kicinski
Browse files

hinic3: remove tx_q name collision hack 



A local variable of tx_q worked around name collision with internal
txq variable in netif_subqueue macros.
This workaround is no longer needed.

Signed-off-by: default avatarGur Stavi <gur.stavi@huawei.com>
Link: https://patch.msgid.link/6376db2a39b8d3bf2fa893f58f56246bed128d5d.1749038081.git.gur.stavi@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent eb89bc37

drivers/net/ethernet/huawei/hinic3/hinic3_tx.c

+9 −11
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ static netdev_tx_t hinic3_send_one_skb(struct sk_buff *skb, 
{

	struct hinic3_sq_wqe_combo wqe_combo = {};

	struct hinic3_tx_info *tx_info;

	struct hinic3_txq *tx_q = txq;

	u32 offload, queue_info = 0;

	struct hinic3_sq_task task;

	u16 wqebb_cnt, num_sge;
@@ -506,9 +505,9 @@ static netdev_tx_t hinic3_send_one_skb(struct sk_buff *skb, 
		if (likely(wqebb_cnt > txq->tx_stop_thrs))

			txq->tx_stop_thrs = min(wqebb_cnt, txq->tx_start_thrs);



		netif_subqueue_try_stop(netdev, tx_q->sq->q_id,

					hinic3_wq_free_wqebbs(&tx_q->sq->wq),

					tx_q->tx_start_thrs);

		netif_subqueue_try_stop(netdev, txq->sq->q_id,

					hinic3_wq_free_wqebbs(&txq->sq->wq),

					txq->tx_start_thrs);



		return NETDEV_TX_BUSY;

	}
@@ -543,10 +542,10 @@ static netdev_tx_t hinic3_send_one_skb(struct sk_buff *skb, 
	}



	netif_subqueue_sent(netdev, txq->sq->q_id, skb->len);

	netif_subqueue_maybe_stop(netdev, tx_q->sq->q_id,

				  hinic3_wq_free_wqebbs(&tx_q->sq->wq),

				  tx_q->tx_stop_thrs,

				  tx_q->tx_start_thrs);

	netif_subqueue_maybe_stop(netdev, txq->sq->q_id,

				  hinic3_wq_free_wqebbs(&txq->sq->wq),

				  txq->tx_stop_thrs,

				  txq->tx_start_thrs);



	hinic3_prepare_sq_ctrl(&wqe_combo, queue_info, num_sge, owner);

	hinic3_write_db(txq->sq, 0, DB_CFLAG_DP_SQ,
@@ -630,7 +629,6 @@ bool hinic3_tx_poll(struct hinic3_txq *txq, int budget) 
	struct net_device *netdev = txq->netdev;

	u16 hw_ci, sw_ci, q_id = txq->sq->q_id;

	struct hinic3_tx_info *tx_info;

	struct hinic3_txq *tx_q = txq;

	unsigned int bytes_compl = 0;

	unsigned int pkts = 0;

	u16 wqebb_cnt = 0;
@@ -662,8 +660,8 @@ bool hinic3_tx_poll(struct hinic3_txq *txq, int budget) 
	hinic3_wq_put_wqebbs(&txq->sq->wq, wqebb_cnt);



	netif_subqueue_completed_wake(netdev, q_id, pkts, bytes_compl,

				      hinic3_wq_free_wqebbs(&tx_q->sq->wq),

				      tx_q->tx_start_thrs);

				      hinic3_wq_free_wqebbs(&txq->sq->wq),

				      txq->tx_start_thrs);



	return pkts == HINIC3_TX_POLL_WEIGHT;

}