Skip to content

Commit 9d34c1c

Browse files
ffainellidavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 40755a0 commit 9d34c1c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

drivers/net/ethernet/broadcom/bcmsysport.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev,
124124
struct bcm_sysport_priv *priv = netdev_priv(dev);
125125
u32 reg;
126126

127-
priv->rx_csum_en = !!(wanted & NETIF_F_RXCSUM);
127+
priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM);
128128
reg = rxchk_readl(priv, RXCHK_CONTROL);
129-
if (priv->rx_csum_en)
129+
if (priv->rx_chk_en)
130130
reg |= RXCHK_EN;
131131
else
132132
reg &= ~RXCHK_EN;
133133

134134
/* If UniMAC forwards CRC, we need to skip over it to get
135135
* a valid CHK bit to be set in the per-packet status word
136136
*/
137-
if (priv->rx_csum_en && priv->crc_fwd)
137+
if (priv->rx_chk_en && priv->crc_fwd)
138138
reg |= RXCHK_SKIP_FCS;
139139
else
140140
reg &= ~RXCHK_SKIP_FCS;
@@ -1674,7 +1674,7 @@ static int bcm_sysport_suspend(struct device *d)
16741674
}
16751675

16761676
/* Disable RXCHK if enabled */
1677-
if (priv->rx_csum_en) {
1677+
if (priv->rx_chk_en) {
16781678
reg = rxchk_readl(priv, RXCHK_CONTROL);
16791679
reg &= ~RXCHK_EN;
16801680
rxchk_writel(priv, reg, RXCHK_CONTROL);
@@ -1750,7 +1750,7 @@ static int bcm_sysport_resume(struct device *d)
17501750
}
17511751

17521752
/* Enable rxhck */
1753-
if (priv->rx_csum_en) {
1753+
if (priv->rx_chk_en) {
17541754
reg = rxchk_readl(priv, RXCHK_CONTROL);
17551755
reg |= RXCHK_EN;
17561756
rxchk_writel(priv, reg, RXCHK_CONTROL);

drivers/net/ethernet/broadcom/bcmsysport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ struct bcm_sysport_priv {
664664
int old_duplex;
665665

666666
/* Misc fields */
667-
unsigned int rx_csum_en:1;
667+
unsigned int rx_chk_en:1;
668668
unsigned int tsb_en:1;
669669
unsigned int crc_fwd:1;
670670
u16 rev;

0 commit comments

Comments
 (0)