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

Commit 73b098d6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-fix-loadable-module-for-DPAA-Ethernet' 



Madalin Bucur says:

====================
net: fix loadable module for DPAA Ethernet

The DPAA Ethernet makes use of a symbol that is not exported.
Address the issue by propagating the dma_ops rather than calling
arch_setup_dma_ops().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fe420d87 fb52728a

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2647,7 +2647,7 @@ static int dpaa_eth_probe(struct platform_device *pdev) 
	priv->buf_layout[TX].priv_data_size = DPAA_TX_PRIV_DATA_SIZE; /* Tx */



	/* device used for DMA mapping */

	arch_setup_dma_ops(dev, 0, 0, NULL, false);

	set_dma_ops(dev, get_dma_ops(&pdev->dev));

	err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));

	if (err) {

		dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");

drivers/net/ethernet/freescale/fman/mac.c

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id, 
		goto no_mem;

	}



	set_dma_ops(&pdev->dev, get_dma_ops(priv->dev));



	ret = platform_device_add_data(pdev, &data, sizeof(data));

	if (ret)

		goto err;