diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-04-04 22:51:15 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-30 17:01:42 +0200 |
| commit | 25efe08e849baeac40b9216bae6a5e0299872306 (patch) | |
| tree | 703aa46580385b0eb4f64ef89adba813a5a40324 /drivers/staging/octeon/ethernet-rgmii.c | |
| parent | 280eb5b528fa49c141cafcc1b86bb24d1760b2d4 (diff) | |
| download | linux-stable-25efe08e849baeac40b9216bae6a5e0299872306.tar.gz linux-stable-25efe08e849baeac40b9216bae6a5e0299872306.tar.bz2 linux-stable-25efe08e849baeac40b9216bae6a5e0299872306.zip | |
staging: octeon-ethernet: eliminate USE_10MBPS_PREAMBLE_WORKAROUND define
We have the workaround always enabled, so eliminate a redundant #define.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-rgmii.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-rgmii.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c index ba2ad2aaca3e..ad332c3e1546 100644 --- a/drivers/staging/octeon/ethernet-rgmii.c +++ b/drivers/staging/octeon/ethernet-rgmii.c @@ -99,14 +99,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) link_info = cvmx_helper_link_get(priv->port); if (link_info.u64 == priv->link_info) { - - /* - * If the 10Mbps preamble workaround is supported and we're - * at 10Mbps we may need to do some special checking. - */ - if (USE_10MBPS_PREAMBLE_WORKAROUND && - (link_info.s.speed == 10)) { - + if (link_info.s.speed == 10) { /* * Read the GMXX_RXX_INT_REG[PCTERR] bit and * see if we are getting preamble errors. @@ -140,12 +133,11 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) return; } - /* If the 10Mbps preamble workaround is allowed we need to on + /* Since the 10Mbps preamble workaround is allowed we need to enable preamble checking, FCS stripping, and clear error bits on every speed change. If errors occur during 10Mbps operation the above code will change this stuff */ - if (USE_10MBPS_PREAMBLE_WORKAROUND) - cvm_oct_set_hw_preamble(priv, true); + cvm_oct_set_hw_preamble(priv, true); if (priv->phydev == NULL) { link_info = cvmx_helper_link_autoconf(priv->port); |