Xilinx: ARM: EmacPs: Ignore collisions for half duplex mode

For half duplex mode the collisions were being reported as errors.
For half duplex mode collisions are expected to occur for heavy
traffic and it is not an error case. Only when number of retries
exceeds the limit, then only it should be reported as an error.
This patch fixes the issue.

Signed-off-by: Anirudha <anirudh@xilinx.com>

diff --git a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/xilinx/xilinx_emacps.c
index 1016a6aa673c492f24fdf58d5f864a39d1b56259..51ee4e5c4ba2f4dceba465ab4958aafbde2f523c 100755 (executable)
--- a/drivers/net/ethernet/xilinx/xilinx_emacps.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emacps.c
@@ -1650,8 +1650,8 @@ static void xemacps_tx_poll(struct net_device *ndev)
         */
        if (regval & (XEMACPS_TXSR_URUN_MASK | XEMACPS_TXSR_RXOVR_MASK |
                XEMACPS_TXSR_HRESPNOK_MASK | XEMACPS_TXSR_COL1000_MASK |
-               XEMACPS_TXSR_BUFEXH_MASK | XEMACPS_TXSR_COL100_MASK)) {
-               printk(KERN_ERR "%s: TX error 0x%x, resetting buffers?\n",
+               XEMACPS_TXSR_BUFEXH_MASK)) {
+               printk(KERN_ERR "%s: TX ERROR 0x%x\n",
                        ndev->name, regval);
                lp->stats.tx_errors++;
        }