Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b0cfee authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: flush xmit_more on error paths 



In case of ring full or DMA mapping error remember to flush xmit_more
delayed kicks.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83d08a1d

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

+2 −0
Original line number Diff line number Diff line
@@ -759,6 +759,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
		nn_dp_warn(dp, "TX ring %d busy. wrp=%u rdp=%u\n",

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

		netif_tx_stop_queue(nd_q);

		nfp_net_tx_xmit_more_flush(tx_ring);

		u64_stats_update_begin(&r_vec->tx_sync);

		r_vec->tx_busy++;

		u64_stats_update_end(&r_vec->tx_sync);
@@ -867,6 +868,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
	tx_ring->txbufs[wr_idx].fidx = -2;

err_free:

	nn_dp_warn(dp, "Failed to map DMA TX buffer\n");

	nfp_net_tx_xmit_more_flush(tx_ring);

	u64_stats_update_begin(&r_vec->tx_sync);

	r_vec->tx_errors++;

	u64_stats_update_end(&r_vec->tx_sync);