[PATCH 3.4 085/125] sh_eth: fix TX buffer byte-swapping

[lizf]

From: Sergei Shtylyov 

3.4.113-rc1 review patch.  If anyone has any objections, please let me know.

--


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 
Signed-off-by: David S. Miller 
Signed-off-by: Zefan Li 
---
 drivers/net/ethernet/renesas/sh_eth.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c 
b/drivers/net/ethernet/renesas/sh_eth.c
index 16caeba..53f5a96 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1513,8 +1513,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct 
net_device *ndev)
txdesc = >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(>dev, skb->data, skb->len,
  DMA_TO_DEVICE);
if (skb->len < ETHERSMALL)
-- 
1.9.1

[PATCH 3.4 085/125] sh_eth: fix TX buffer byte-swapping

[lizf]

From: Sergei Shtylyov 

3.4.113-rc1 review patch.  If anyone has any objections, please let me know.

--


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 
Signed-off-by: David S. Miller 
Signed-off-by: Zefan Li 
---
 drivers/net/ethernet/renesas/sh_eth.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c 
b/drivers/net/ethernet/renesas/sh_eth.c
index 16caeba..53f5a96 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1513,8 +1513,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct 
net_device *ndev)
txdesc = >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(>dev, skb->data, skb->len,
  DMA_TO_DEVICE);
if (skb->len < ETHERSMALL)
-- 
1.9.1