Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d34c1cb authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40755a0f

drivers/net/ethernet/broadcom/bcmsysport.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -124,9 +124,9 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev, 
	struct bcm_sysport_priv *priv = netdev_priv(dev);

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	u32 reg;

	u32 reg;





	priv->rx_csum_en = !!(wanted & NETIF_F_RXCSUM);

	priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM);

	reg = rxchk_readl(priv, RXCHK_CONTROL);

	reg = rxchk_readl(priv, RXCHK_CONTROL);

	if (priv->rx_csum_en)

	if (priv->rx_chk_en)

		reg |= RXCHK_EN;

		reg |= RXCHK_EN;

	else

	else

		reg &= ~RXCHK_EN;

		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

	/* 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

	 * 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;

		reg |= RXCHK_SKIP_FCS;

	else

	else

		reg &= ~RXCHK_SKIP_FCS;

		reg &= ~RXCHK_SKIP_FCS;
@@ -1674,7 +1674,7 @@ static int bcm_sysport_suspend(struct device *d) 
	}

	}





	/* Disable RXCHK if enabled */

	/* Disable RXCHK if enabled */

	if (priv->rx_csum_en) {

	if (priv->rx_chk_en) {

		reg = rxchk_readl(priv, RXCHK_CONTROL);

		reg = rxchk_readl(priv, RXCHK_CONTROL);

		reg &= ~RXCHK_EN;

		reg &= ~RXCHK_EN;

		rxchk_writel(priv, reg, RXCHK_CONTROL);

		rxchk_writel(priv, reg, RXCHK_CONTROL);
@@ -1750,7 +1750,7 @@ static int bcm_sysport_resume(struct device *d) 
	}

	}





	/* Enable rxhck */

	/* Enable rxhck */

	if (priv->rx_csum_en) {

	if (priv->rx_chk_en) {

		reg = rxchk_readl(priv, RXCHK_CONTROL);

		reg = rxchk_readl(priv, RXCHK_CONTROL);

		reg |= RXCHK_EN;

		reg |= RXCHK_EN;

		rxchk_writel(priv, reg, RXCHK_CONTROL);

		rxchk_writel(priv, reg, RXCHK_CONTROL);

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ struct bcm_sysport_priv { 
	int			old_duplex;

	int			old_duplex;





	/* Misc fields */

	/* Misc fields */

	unsigned int		rx_csum_en:1;

	unsigned int		rx_chk_en:1;

	unsigned int		tsb_en:1;

	unsigned int		tsb_en:1;

	unsigned int		crc_fwd:1;

	unsigned int		crc_fwd:1;

	u16			rev;

	u16			rev;