diff options
| author | Florian Fainelli | 2018-07-11 11:47:58 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-12 23:47:47 +0200 |
| commit | 9e3bff923913729d76d87f0015848ee7b8ff7083 (patch) | |
| tree | bd61f6707025750d1944fb1eae95974d56fac56c /drivers/net/ethernet/broadcom/bcmsysport.c | |
| parent | tcp: allow user to create repair socket without window probes (diff) | |
| download | kernel-qcow2-linux-9e3bff923913729d76d87f0015848ee7b8ff7083.tar.gz kernel-qcow2-linux-9e3bff923913729d76d87f0015848ee7b8ff7083.tar.xz kernel-qcow2-linux-9e3bff923913729d76d87f0015848ee7b8ff7083.zip | |
net: systemport: Fix CRC forwarding check for SYSTEMPORT Lite
SYSTEMPORT Lite reversed the logic compared to SYSTEMPORT, the
GIB_FCS_STRIP bit is set when the Ethernet FCS is stripped, and that bit
is not set by default. Fix the logic such that we properly check whether
that bit is set or not and we don't forward an extra 4 bytes to the
network stack.
Fixes: 44a4524c54af ("net: systemport: Add support for SYSTEMPORT Lite")
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index d5fca2e5a9bc..a1f60f89e059 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1946,8 +1946,8 @@ static int bcm_sysport_open(struct net_device *dev) if (!priv->is_lite) priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD); else - priv->crc_fwd = !!(gib_readl(priv, GIB_CONTROL) & - GIB_FCS_STRIP); + priv->crc_fwd = !((gib_readl(priv, GIB_CONTROL) & + GIB_FCS_STRIP) >> GIB_FCS_STRIP_SHIFT); phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link, 0, priv->phy_interface); |