diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
| commit | ec665af5dd517c60ea1fbe791f6c8ecc443a61b6 (patch) | |
| tree | adfe7a2578ecde6d65e927afe65b289efb458ab1 /drivers/net/ethernet/broadcom/bcmsysport.c | |
| parent | 46543af4c9edc5701729b24dd395c23a40871aa9 (diff) | |
| parent | f952480a8fc14ea24a4de9582e425924f98c92d3 (diff) | |
Merge tag 'v4.14.58' into linux-linaro-lsk-v4.14lsk-v4.14-18.07
This is the 4.14.58 stable release
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 1e856e8b9a92..0fff2432ab4c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1851,8 +1851,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); |