| From 540b4904331b6a08d85b36a258bda411444dd77f Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sat, 7 Jan 2017 00:03:37 +0300 |
| Subject: [PATCH 128/255] sh_eth: rename 'sh_eth_cpu_data::hw_crc' |
| |
| The 'struct sh_eth_cpu_data' field indicating the "intelligent checksum" |
| support was misnamed 'hw_crc' -- rename it to 'hw_checksum'. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 62e04b7e0e3c2926bdcbcced9feb22478258d0c3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 12 ++++++------ |
| drivers/net/ethernet/renesas/sh_eth.h | 2 +- |
| 2 files changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -535,7 +535,7 @@ static struct sh_eth_cpu_data r7s72100_d |
| .rpadir_value = 2 << 16, |
| .no_trimd = 1, |
| .no_ade = 1, |
| - .hw_crc = 1, |
| + .hw_checksum = 1, |
| .tsu = 1, |
| }; |
| |
| @@ -573,7 +573,7 @@ static struct sh_eth_cpu_data r8a7740_da |
| .rpadir_value = 2 << 16, |
| .no_trimd = 1, |
| .no_ade = 1, |
| - .hw_crc = 1, |
| + .hw_checksum = 1, |
| .tsu = 1, |
| .select_mii = 1, |
| }; |
| @@ -812,7 +812,7 @@ static struct sh_eth_cpu_data sh7734_dat |
| .no_trimd = 1, |
| .no_ade = 1, |
| .tsu = 1, |
| - .hw_crc = 1, |
| + .hw_checksum = 1, |
| .select_mii = 1, |
| }; |
| |
| @@ -928,7 +928,7 @@ static int sh_eth_reset(struct net_devic |
| sh_eth_write(ndev, 0x0, RDFFR); |
| |
| /* Reset HW CRC register */ |
| - if (mdp->cd->hw_crc) |
| + if (mdp->cd->hw_checksum) |
| sh_eth_write(ndev, 0x0, CSMR); |
| |
| /* Select MII mode */ |
| @@ -1425,7 +1425,7 @@ static int sh_eth_rx(struct net_device * |
| * the RFS bits are from bit 25 to bit 16. So, the |
| * driver needs right shifting by 16. |
| */ |
| - if (mdp->cd->hw_crc) |
| + if (mdp->cd->hw_checksum) |
| desc_status >>= 16; |
| |
| skb = mdp->rx_skbuff[entry]; |
| @@ -1999,7 +1999,7 @@ static size_t __sh_eth_get_regs(struct n |
| add_reg(MAFCR); |
| if (cd->rtrate) |
| add_reg(RTRATE); |
| - if (cd->hw_crc) |
| + if (cd->hw_checksum) |
| add_reg(CSMR); |
| if (cd->select_mii) |
| add_reg(RMII_MII); |
| --- a/drivers/net/ethernet/renesas/sh_eth.h |
| +++ b/drivers/net/ethernet/renesas/sh_eth.h |
| @@ -488,7 +488,7 @@ struct sh_eth_cpu_data { |
| unsigned rpadir:1; /* E-DMAC have RPADIR */ |
| unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */ |
| unsigned no_ade:1; /* E-DMAC DO NOT have ADE bit in EESR */ |
| - unsigned hw_crc:1; /* E-DMAC have CSMR */ |
| + unsigned hw_checksum:1; /* E-DMAC has CSMR */ |
| unsigned select_mii:1; /* EtherC have RMII_MII (MII select register) */ |
| unsigned rmiimode:1; /* EtherC has RMIIMODE register */ |
| unsigned rtrate:1; /* EtherC has RTRATE register */ |