From a56c3025e8a748b99d23cad985ecde8019ac1801 Mon Sep 17 00:00:00 2001
From: Sahil Malhotra <sahilmalhotra@freescale.com>
Date: Fri, 17 Oct 2014 18:46:21 +0530
Subject: Fix for watchdog expiry when running netperf UDP traffic with ASF
 enabled in Linux.

This patch is workaround for watchdog expiry problem on running
netperf client on DUT with UDP traffic with ASF enabled.

Change-Id: Ib9a9c8fd13e5ecb6f9daf30deb8f128b629c002d
Signed-off-by: Sahil Malhotra <sahilmalhotra@freescale.com>
CR:ENGR00336061
Reviewed-on: http://git.am.freescale.net:8181/23065
Reviewed-by: Sandeep Malik <Sandeep.Malik@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>

diff --git a/drivers/net/ethernet/freescale/asf_gianfar.c b/drivers/net/ethernet/freescale/asf_gianfar.c
index 5280ed9..f6f89a3 100644
--- a/drivers/net/ethernet/freescale/asf_gianfar.c
+++ b/drivers/net/ethernet/freescale/asf_gianfar.c
@@ -207,15 +207,8 @@ int gfar_asf_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	do {
 		lstatus = txbdp->lstatus;
 		if ((lstatus & BD_LFLAG(TXBD_READY))) {
-			u32 imask;
 			/* BD not free for tx */
-			netif_tx_stop_queue(txq);
 			dev->stats.tx_fifo_errors++;
-			spin_lock_irq(&tx_queue->grp->grplock);
-			imask = gfar_read(&regs->imask);
-			imask |= IMASK_TX_DEFAULT;
-			gfar_write(&regs->imask, imask);
-			spin_unlock_irq(&tx_queue->grp->grplock);
 			return NETDEV_TX_BUSY;
 		}
 
-- 
cgit v0.10.2