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>

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6ea30bace6859200057ef7dab2c818b8593757a3..90fb0e9743b32c153dc50e74b63fd958c57307e6 100644 (file)
--- 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_data = {
        .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_data = {
        .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_data = {
        .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_device *ndev)
                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 */
@@ -1413,7 +1413,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
                 * 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];
@@ -1987,7 +1987,7 @@ static size_t __sh_eth_get_regs(struct net_device *ndev, u32 *buf)
        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);

diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index f09fa8b47f9a6f6e8835e1a3ce3eb4508d2ba8fb..4ada0ff377121b5d9126b7b1b48bf91ba8e109c9 100644 (file)
--- 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 */