summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/drivers/net
diff options
context:
space:
mode:
authorsave2009-08-03 12:13:01 +0000
committersave2009-08-03 12:13:01 +0000
commit3f18fbfdc7b7f3934c221ed1aec1c64de862339f (patch)
treef285dd5a387ec7e90ceb85a8f28bef837e9c087a /cleopatre/linux-2.6.25.10-spc300/drivers/net
parent2faf4d575e1f26b2216fa1af89645944360ef3f6 (diff)
[CLEO][ETHDRV] Suppressed TX timeout when we are under Arizona platform
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5142 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/drivers/net')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
index 2565668234..64da0fa76b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
@@ -692,12 +692,14 @@ static void synop3504_set_multicast(struct net_device *dev)
* This will control transmission timeout.
* \param dev net device.
*/
+#ifndef CONFIG_MACH_ARIZONA
static void synop3504_tx_timeout(struct net_device *dev)
{
dev->stats.tx_errors++;
dev->trans_start = jiffies;
printk (KERN_WARNING DRV_NAME" %s: Transmit timed out\n",dev->name);
}// synop3504_tx_timeout
+#endif
/**
* Ethtool device interface.
@@ -1351,8 +1353,10 @@ static int synop3504_init(struct net_device *dev)
dev->get_stats = synop3504_stats;
dev->set_multicast_list = synop3504_set_multicast;
dev->change_mtu = synop3504_change_mtu;
+#ifndef CONFIG_MACH_ARIZONA
dev->tx_timeout = synop3504_tx_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
+#endif
//Set NAPI mode
netif_napi_add(dev, &priv->napi, &synop3504_poll, NAPI_BUDGET);