Skip to content

Commit

Permalink
net: systemport: rename rx_csum_en to rx_chk_en
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jul 8, 2014
1 parent 40755a0 commit 9d34c1c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ethernet/broadcom/bcmsysport.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@ 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;

/* 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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/broadcom/bcmsysport.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9d34c1c

Please sign in to comment.