| From 810e035088db52878190eb438d157d3a9a243fa0 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 10 Oct 2013 14:51:16 +0900 |
| Subject: net: sh_eth: Correct fix for RX packet errors on R8A7740 |
| |
| Nguyen Hong Ky posted a patch to correct RX packet errors on R8A7740 which |
| was applied as 2c6221e4a5aab417 ("net: sh_eth: Fix RX packets errors on |
| R8A7740"). Unfortunately sh_eth.c contains many similar instances |
| of struct sh_eth_cpu_data and the patch was miss-applied, updating |
| sh7734_data instead of r8a7740_data. |
| |
| This patch corrects this problem by. |
| 1. Reverting the change to sh7734_data and; |
| 2. Applying the change to r8a7740_data. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit cc23528db0300d5c8c0b98670a577bf1dc3e0e82) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| drivers/net/ethernet/renesas/sh_eth.c |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index bfa7a201..b54bbbd5 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -620,16 +620,12 @@ static struct sh_eth_cpu_data sh7734_data = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ |
| EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ |
| EESR_ECI, |
| - .fdr_value = 0x0000070f, |
| - .rmcr_value = 0x00000001, |
| |
| .apr = 1, |
| .mpr = 1, |
| .tpauser = 1, |
| .bculr = 1, |
| .hw_swap = 1, |
| - .rpadir = 1, |
| - .rpadir_value = 2 << 16, |
| .no_trimd = 1, |
| .no_ade = 1, |
| .tsu = 1, |
| @@ -692,12 +688,16 @@ static struct sh_eth_cpu_data r8a7740_data = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | |
| EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
| EESR_TDE | EESR_ECI, |
| + .fdr_value = 0x0000070f, |
| + .rmcr_value = 0x00000001, |
| |
| .apr = 1, |
| .mpr = 1, |
| .tpauser = 1, |
| .bculr = 1, |
| .hw_swap = 1, |
| + .rpadir = 1, |
| + .rpadir_value = 2 << 16, |
| .no_trimd = 1, |
| .no_ade = 1, |
| .tsu = 1, |
| -- |
| 1.8.4.3.gca3854a |
| |