diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-07-02 00:08:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-07 23:56:47 -0400 |
commit | 9d34c1cb01ddef8e99c7855513a578c066f8300f (patch) | |
tree | fdf9cf2e09aaeb291a8690306d02f2a7a71dd3f5 /drivers/net/ethernet/broadcom/bcmsysport.c | |
parent | 40755a0fce17c39557fd55b634024082671074ed (diff) |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 9dabcfbfc23a..f00793e45330 100644 --- 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, | |||
124 | struct bcm_sysport_priv *priv = netdev_priv(dev); | 124 | struct bcm_sysport_priv *priv = netdev_priv(dev); |
125 | u32 reg; | 125 | u32 reg; |
126 | 126 | ||
127 | priv->rx_csum_en = !!(wanted & NETIF_F_RXCSUM); | 127 | priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM); |
128 | reg = rxchk_readl(priv, RXCHK_CONTROL); | 128 | reg = rxchk_readl(priv, RXCHK_CONTROL); |
129 | if (priv->rx_csum_en) | 129 | if (priv->rx_chk_en) |
130 | reg |= RXCHK_EN; | 130 | reg |= RXCHK_EN; |
131 | else | 131 | else |
132 | reg &= ~RXCHK_EN; | 132 | reg &= ~RXCHK_EN; |
@@ -134,7 +134,7 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev, | |||
134 | /* If UniMAC forwards CRC, we need to skip over it to get | 134 | /* If UniMAC forwards CRC, we need to skip over it to get |
135 | * a valid CHK bit to be set in the per-packet status word | 135 | * a valid CHK bit to be set in the per-packet status word |
136 | */ | 136 | */ |
137 | if (priv->rx_csum_en && priv->crc_fwd) | 137 | if (priv->rx_chk_en && priv->crc_fwd) |
138 | reg |= RXCHK_SKIP_FCS; | 138 | reg |= RXCHK_SKIP_FCS; |
139 | else | 139 | else |
140 | reg &= ~RXCHK_SKIP_FCS; | 140 | reg &= ~RXCHK_SKIP_FCS; |
@@ -1674,7 +1674,7 @@ static int bcm_sysport_suspend(struct device *d) | |||
1674 | } | 1674 | } |
1675 | 1675 | ||
1676 | /* Disable RXCHK if enabled */ | 1676 | /* Disable RXCHK if enabled */ |
1677 | if (priv->rx_csum_en) { | 1677 | if (priv->rx_chk_en) { |
1678 | reg = rxchk_readl(priv, RXCHK_CONTROL); | 1678 | reg = rxchk_readl(priv, RXCHK_CONTROL); |
1679 | reg &= ~RXCHK_EN; | 1679 | reg &= ~RXCHK_EN; |
1680 | rxchk_writel(priv, reg, RXCHK_CONTROL); | 1680 | rxchk_writel(priv, reg, RXCHK_CONTROL); |
@@ -1750,7 +1750,7 @@ static int bcm_sysport_resume(struct device *d) | |||
1750 | } | 1750 | } |
1751 | 1751 | ||
1752 | /* Enable rxhck */ | 1752 | /* Enable rxhck */ |
1753 | if (priv->rx_csum_en) { | 1753 | if (priv->rx_chk_en) { |
1754 | reg = rxchk_readl(priv, RXCHK_CONTROL); | 1754 | reg = rxchk_readl(priv, RXCHK_CONTROL); |
1755 | reg |= RXCHK_EN; | 1755 | reg |= RXCHK_EN; |
1756 | rxchk_writel(priv, reg, RXCHK_CONTROL); | 1756 | rxchk_writel(priv, reg, RXCHK_CONTROL); |