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

Commit 86927afb authored by Brett Creeley's avatar Brett Creeley Committed by Greg Kroah-Hartman
Browse files

ice: Fix the bytecount sent to netdev_tx_sent_queue 



[ Upstream commit d944b46992f8e99b6bdc721e44b02e5ca294fa2b ]

Currently if the driver does a TSO offload the bytecount sent to
netdev_tx_sent_queue will be incorrect. This is because in ice_tso we
overwrite the initial value that we set in ice_tx_map. This creates a
mismatch between the Tx and Tx clean flow. In the Tx clean flow we
calculate the bytecount (called total_bytes) as we clean the
descriptors so the value used in the Tx clean path is correct. Fix this
by using += in ice_tso instead of =. This fixes the mismatch in
bytecount mentioned above.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9d977cd1

drivers/net/ethernet/intel/ice/ice_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ int ice_tso(struct ice_tx_buf *first, struct ice_tx_offload_params *off) 


	/* update gso_segs and bytecount */

	first->gso_segs = skb_shinfo(skb)->gso_segs;

	first->bytecount = (first->gso_segs - 1) * off->header_len;

	first->bytecount += (first->gso_segs - 1) * off->header_len;



	cd_tso_len = skb->len - off->header_len;

	cd_mss = skb_shinfo(skb)->gso_size;