net: systemport: rename rx_csum_en to rx_chk_en

This boolean tells us whether we are using the RXCHK hardware block,
so use a variable name that reflects that. RXCHK might be used in the
future to implement Wake-on-LAN using ARP or unicast packets.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 9dabcfbfc23a14a4cf5c14a744331edcb27180e2..f00793e453303dbfd512ab8edb689a994dd62a31 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -124,9 +124,9 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev,
        struct bcm_sysport_priv *priv = netdev_priv(dev);
        u32 reg;
 
-       priv->rx_csum_en = !!(wanted & NETIF_F_RXCSUM);
+       priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM);
        reg = rxchk_readl(priv, RXCHK_CONTROL);
-       if (priv->rx_csum_en)
+       if (priv->rx_chk_en)
                reg |= RXCHK_EN;
        else
                reg &= ~RXCHK_EN;
@@ -134,7 +134,7 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev,
        /* If UniMAC forwards CRC, we need to skip over it to get
         * a valid CHK bit to be set in the per-packet status word
         */
-       if (priv->rx_csum_en && priv->crc_fwd)
+       if (priv->rx_chk_en && priv->crc_fwd)
                reg |= RXCHK_SKIP_FCS;
        else
                reg &= ~RXCHK_SKIP_FCS;
@@ -1674,7 +1674,7 @@ static int bcm_sysport_suspend(struct device *d)
        }
 
        /* Disable RXCHK if enabled */
-       if (priv->rx_csum_en) {
+       if (priv->rx_chk_en) {
                reg = rxchk_readl(priv, RXCHK_CONTROL);
                reg &= ~RXCHK_EN;
                rxchk_writel(priv, reg, RXCHK_CONTROL);
@@ -1750,7 +1750,7 @@ static int bcm_sysport_resume(struct device *d)
        }
 
        /* Enable rxhck */
-       if (priv->rx_csum_en) {
+       if (priv->rx_chk_en) {
                reg = rxchk_readl(priv, RXCHK_CONTROL);
                reg |= RXCHK_EN;
                rxchk_writel(priv, reg, RXCHK_CONTROL);

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index 281c082460375611bc61c02baa476a9c0d03b33a..20ea7162478f74f12a56fc6a7ade3856cca35dcf 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -664,7 +664,7 @@ struct bcm_sysport_priv {
        int                     old_duplex;
 
        /* Misc fields */
-       unsigned int            rx_csum_en:1;
+       unsigned int            rx_chk_en:1;
        unsigned int            tsb_en:1;
        unsigned int            crc_fwd:1;
        u16                     rev;