git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tokenring
/
3c359.c
diff --git
a/drivers/net/tokenring/3c359.c
b/drivers/net/tokenring/3c359.c
index
0337b9d
..
b40b6de
100644
(file)
--- a/
drivers/net/tokenring/3c359.c
+++ b/
drivers/net/tokenring/3c359.c
@@
-1243,7
+1243,7
@@
static int xl_xmit(struct sk_buff *skb, struct net_device *dev)
return 0;
} else {
spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ;
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
}