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

Commit eee57723 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: bcmgenet: fix dma api length mismatch 



When un-mapping skb->data in __bcmgenet_tx_reclaim(),
we must use the length that was used in original dma_map_single(),
instead of skb->len that might be bigger (includes the frags)

We simply can store skb_len into tx_cb_ptr->dma_len and use it
at unmap time.

Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76e39ccf

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+2 −2
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, 
			dev->stats.tx_bytes += tx_cb_ptr->skb->len;

			dma_unmap_single(&dev->dev,

					 dma_unmap_addr(tx_cb_ptr, dma_addr),

					 tx_cb_ptr->skb->len,

					 dma_unmap_len(tx_cb_ptr, dma_len),

					 DMA_TO_DEVICE);

			bcmgenet_free_cb(tx_cb_ptr);

		} else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) {
@@ -1308,7 +1308,7 @@ static int bcmgenet_xmit_single(struct net_device *dev, 
	}



	dma_unmap_addr_set(tx_cb_ptr, dma_addr, mapping);

	dma_unmap_len_set(tx_cb_ptr, dma_len, skb->len);

	dma_unmap_len_set(tx_cb_ptr, dma_len, skb_len);

	length_status = (skb_len << DMA_BUFLENGTH_SHIFT) | dma_desc_flags |

			(priv->hw_params->qtag_mask << DMA_TX_QTAG_SHIFT) |

			DMA_TX_APPEND_CRC;