| From fd297df63a0a2bcff13cd9a692bd9051ec667b91 Mon Sep 17 00:00:00 2001 |
| From: Brett Creeley <brett.creeley@intel.com> |
| Date: Fri, 26 Oct 2018 10:40:59 -0700 |
| Subject: 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: Brett Creeley <brett.creeley@intel.com> |
| Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c |
| index 6481e3d86374..0c95c8f83432 100644 |
| --- a/drivers/net/ethernet/intel/ice/ice_txrx.c |
| +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c |
| @@ -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; |
| -- |
| 2.17.1 |
| |
