]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sh_eth: fix TX buffer byte-swapping
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Sun, 13 Dec 2015 18:27:04 +0000 (21:27 +0300)
committerZefan Li <lizefan@huawei.com>
Wed, 26 Oct 2016 15:15:38 +0000 (23:15 +0800)
commit 3e2309937f1e5d538ff13da5fb8de41196927c61 upstream.

For the little-endian SH771x kernels the driver has to byte-swap the RX/TX
buffers,  however yet unset physcial address from the TX descriptor is used
to call sh_eth_soft_swap(). Use 'skb->data' instead...

Fixes: 31fcb99d9958 ("net: sh_eth: remove __flush_purge_region")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Zefan Li <lizefan@huawei.com>
drivers/net/ethernet/renesas/sh_eth.c

index 16caebaec00785acd48d85a96ad8626214882c8c..53f5a96e99c36683c46460106eedf7355976c714 100644 (file)
@@ -1513,8 +1513,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        txdesc = &mdp->tx_ring[entry];
        /* soft swap. */
        if (!mdp->cd->hw_swap)
-               sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)),
-                                skb->len + 2);
+               sh_eth_soft_swap(PTR_ALIGN(skb->data, 4), skb->len + 2);
        txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
                                      DMA_TO_DEVICE);
        if (skb->len < ETHERSMALL)