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>

diff --git a/drivers/staging/octeon/ethernet-defines.h b/drivers/staging/octeon/ethernet-defines.h
index d61955cb438cfb4663dce3b776be3578774ffb91..de6ae6bf918a6f2162c0ffc1c5883f3bd3ab403a 100644 (file)
--- a/drivers/staging/octeon/ethernet-defines.h
+++ b/drivers/staging/octeon/ethernet-defines.h
@@ -67,11 +67,6 @@
 #define USE_RED                     1
 #define USE_ASYNC_IOBDMA            (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0)
 
-/*
- * Allow SW based preamble removal at 10Mbps to workaround PHYs giving
- * us bad preambles.
- */
-#define USE_10MBPS_PREAMBLE_WORKAROUND 1
 /*
  * Use this to have all FPA frees also tell the L2 not to write data
  * to memory.

diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index ba2ad2aaca3ebc8f4bc35bfe38a51ecce7cfd770..ad332c3e154661d7b01d1a94a95b6b69632f4c61 100644 (file)
--- 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);

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 22667dbb10d8259de504a2eb15b9f668cd553c3a..8d40986f60efd1302e8b37303ebdaa2f07cb5963 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -93,11 +93,8 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
                 * instead of 60+4FCS.  Note these packets still get
                 * counted as frame errors.
                 */
-       } else
-           if (USE_10MBPS_PREAMBLE_WORKAROUND
-               && ((work->word2.snoip.err_code == 5)
-                   || (work->word2.snoip.err_code == 7))) {
-
+       } else if (work->word2.snoip.err_code == 5 ||
+                  work->word2.snoip.err_code == 7) {
                /*
                 * We received a packet with either an alignment error
                 * or a FCS error. This may be signalling that we are