Commit 01fbd3f5 authored Jan 15, 2015 by Geert Uytterhoeven Committed by David S. Miller Jan 15, 2015

sh_eth: Fix addition of .trscer_err_mask to wrong SoC data



commit b284fbe3 ("sh_eth: Fix access to TRSCER register") wanted
to add a .trscer_err_mask value to the R-Car Gen2 family-specific data
structure (r8a779x_data), but it was accidentally added to the
SH7724-specific data structure (sh7724_data).

Presumably this happened due to a patch conflict with commit
d407bc02 ("sh-eth: Set fdr_value of R-Car SoCs"), which added
another field at the same position.

Move the field setting to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: b284fbe3 ("sh_eth: Fix access to TRSCER register")
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9f6bd8fa

drivers/net/ethernet/renesas/sh_eth.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -498,6 +498,8 @@ static struct sh_eth_cpu_data r8a779x_data = {
		EESR_ECI,
		.fdr_value = 0x00000f0f,

		.trscer_err_mask = DESC_I_RINT8,

		.apr = 1,
		.mpr = 1,
		.tpauser = 1,
		@@ -538,8 +540,6 @@ static struct sh_eth_cpu_data sh7724_data = {
		EESR_RDE \| EESR_RFRMER \| EESR_TFE \| EESR_TDE \|
		EESR_ECI,

		.trscer_err_mask = DESC_I_RINT8,

		.apr = 1,
		.mpr = 1,
		.tpauser = 1,

Admin message