Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
此提交包含在:
@@ -574,6 +574,7 @@ static struct sh_eth_cpu_data r8a7740_data = {
|
||||
.rpadir_value = 2 << 16,
|
||||
.no_trimd = 1,
|
||||
.no_ade = 1,
|
||||
.hw_crc = 1,
|
||||
.tsu = 1,
|
||||
.select_mii = 1,
|
||||
.shift_rd0 = 1,
|
||||
@@ -798,7 +799,7 @@ static struct sh_eth_cpu_data sh7734_data = {
|
||||
|
||||
.ecsr_value = ECSR_ICD | ECSR_MPD,
|
||||
.ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
|
||||
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
|
||||
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003f07ff,
|
||||
|
||||
.tx_check = EESR_TC1 | EESR_FTC,
|
||||
.eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
|
||||
@@ -828,7 +829,7 @@ static struct sh_eth_cpu_data sh7763_data = {
|
||||
|
||||
.ecsr_value = ECSR_ICD | ECSR_MPD,
|
||||
.ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
|
||||
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
|
||||
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003f07ff,
|
||||
|
||||
.tx_check = EESR_TC1 | EESR_FTC,
|
||||
.eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
|
||||
|
新增問題並參考
封鎖使用者