From abae270495d0a8cb24f37fee74113174a4a6d28f Mon Sep 17 00:00:00 2001
From: Erik Mouw <mouw@nl.linux.org>
Date: Mon, 4 Feb 2008 18:56:54 +0100
Subject: [PATCH] --- yaml --- r: 83651 b: refs/heads/master c:
 06f7525be463ef95bfdba001484bda04d00ec74e h: refs/heads/master i:   83649:
 c4d9f1556e9ec964646da4a0777afb9a73180645   83647:
 4f6502c3b6a0d72caedff1358af84d1747570e8d v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/tulip/xircom_cb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae35432c2d0c..b2a8177f2932 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c04a515085e6b94266db3e0e05c2700eeffa469
+refs/heads/master: 06f7525be463ef95bfdba001484bda04d00ec74e
diff --git a/trunk/drivers/net/tulip/xircom_cb.c b/trunk/drivers/net/tulip/xircom_cb.c
index 8fc7274642eb..6b93d0169116 100644
--- a/trunk/drivers/net/tulip/xircom_cb.c
+++ b/trunk/drivers/net/tulip/xircom_cb.c
@@ -441,7 +441,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	spin_unlock_irqrestore(&card->lock,flags);
 	trigger_transmit(card);
 
-	return -EIO;
+	return NETDEV_TX_BUSY;
 }