Commit 8b5ddf1e authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: move queue variable init 



nd_q is only used at the very end of nfp_net_tx(), there is no need
to initialize it early.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de31049a

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+3 −1
Original line number Diff line number Diff line
@@ -801,13 +801,13 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
	qidx = skb_get_queue_mapping(skb);

	tx_ring = &dp->tx_rings[qidx];

	r_vec = tx_ring->r_vec;

	nd_q = netdev_get_tx_queue(dp->netdev, qidx);



	nr_frags = skb_shinfo(skb)->nr_frags;



	if (unlikely(nfp_net_tx_full(tx_ring, nr_frags + 1))) {

		nn_dp_warn(dp, "TX ring %d busy. wrp=%u rdp=%u\n",

			   qidx, tx_ring->wr_p, tx_ring->rd_p);

		nd_q = netdev_get_tx_queue(dp->netdev, qidx);

		netif_tx_stop_queue(nd_q);

		nfp_net_tx_xmit_more_flush(tx_ring);

		u64_stats_update_begin(&r_vec->tx_sync);
@@ -894,6 +894,8 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 


	skb_tx_timestamp(skb);



	nd_q = netdev_get_tx_queue(dp->netdev, tx_ring->idx);



	tx_ring->wr_p += nr_frags + 1;

	if (nfp_net_tx_ring_should_stop(tx_ring))

		nfp_net_tx_ring_stop(nd_q, tx_ring);

CRA Git | Maintained and supported by SUSTech CRA and CCSE