Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"

Browse Source 
This reverts commit fd9af07c34.

The hardware manual states that the frame error and multicast bits are
copied to bits 9:0 of RD0, not bits 25:16.  I've tested that this is
true for RFS1 (CRC error), RFS3 (frame too short), RFS4 (frame too
long) and RFS8 (multicast).

Also adjust a comment to agree with this.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2015-03-03 00:52:39 +00:00 committed by David S. Miller
parent 6ded286555
commit 9b4a6364a6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -508,7 +508,6 @@ static struct sh_eth_cpu_data r8a779x_data = {
.tpauser = 1, .tpauser = 1,
.hw_swap = 1, .hw_swap = 1,
.rmiimode = 1, .rmiimode = 1,
.shift_rd0 = 1,
}; };
static void sh_eth_set_rate_sh7724(struct net_device *ndev) static void sh_eth_set_rate_sh7724(struct net_device *ndev)
@ -1462,8 +1461,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
/* In case of almost all GETHER/ETHERs, the Receive Frame State /* In case of almost all GETHER/ETHERs, the Receive Frame State
* (RFS) bits in the Receive Descriptor 0 are from bit 9 to * (RFS) bits in the Receive Descriptor 0 are from bit 9 to
* bit 0. However, in case of the R8A7740, R8A779x, and * bit 0. However, in case of the R8A7740 and R7S72100
* R7S72100 the RFS bits are from bit 25 to bit 16. So, the * the RFS bits are from bit 25 to bit 16. So, the
* driver needs right shifting by 16. * driver needs right shifting by 16.
*/ */
if (mdp->cd->shift_rd0) if (mdp->cd->shift_rd0)