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

Commit 3e8fc38c authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: systemport: fix DMA allocation/freeing sizes 



We should not be allocating a single byte of DMA coherent memory, but
instead a full-sized struct dma_desc (8 bytes).

Fixes: 80105bef ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43737473

drivers/net/ethernet/broadcom/bcmsysport.c

+4 −2
Original line number Diff line number Diff line
@@ -1110,7 +1110,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, 
	/* We just need one DMA descriptor which is DMA-able, since writing to

	 * the port will allocate a new descriptor in its internal linked-list

	 */

	p = dma_zalloc_coherent(kdev, 1, &ring->desc_dma, GFP_KERNEL);

	p = dma_zalloc_coherent(kdev, sizeof(struct dma_desc), &ring->desc_dma,

				GFP_KERNEL);

	if (!p) {

		netif_err(priv, hw, priv->netdev, "DMA alloc failed\n");

		return -ENOMEM;
@@ -1183,7 +1184,8 @@ static void bcm_sysport_fini_tx_ring(struct bcm_sysport_priv *priv, 
	ring->cbs = NULL;



	if (ring->desc_dma) {

		dma_free_coherent(kdev, 1, ring->desc_cpu, ring->desc_dma);

		dma_free_coherent(kdev, sizeof(struct dma_desc),

				  ring->desc_cpu, ring->desc_dma);

		ring->desc_dma = 0;

	}

	ring->size = 0;