| Message ID | 1562570741-25108-1-git-send-email-ilias.apalodimas@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | net: netsec: Sync dma for device on buffer allocation | expand |
From: Ilias Apalodimas <ilias.apalodimas@linaro.org> Date: Mon, 8 Jul 2019 10:25:41 +0300 > cd1973a9215a ("net: netsec: Sync dma for device on buffer allocation") > was merged on it's v1 instead of the v3. > Merge the proper patch version > > Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Applied to net-next, thanks.
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index f6e261c6a059..460777449cd9 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -743,9 +743,7 @@ static void *netsec_alloc_rx_data(struct netsec_priv *priv, */ *desc_len = PAGE_SIZE - NETSEC_RX_BUF_NON_DATA; dma_dir = page_pool_get_dma_dir(dring->page_pool); - dma_sync_single_for_device(priv->dev, - *dma_handle - NETSEC_RXBUF_HEADROOM, - PAGE_SIZE, dma_dir); + dma_sync_single_for_device(priv->dev, *dma_handle, *desc_len, dma_dir); return page_address(page); }
cd1973a9215a ("net: netsec: Sync dma for device on buffer allocation") was merged on it's v1 instead of the v3. Merge the proper patch version Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> --- drivers/net/ethernet/socionext/netsec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.20.1