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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tokenring
/
olympic.c
diff --git
a/drivers/net/tokenring/olympic.c
b/drivers/net/tokenring/olympic.c
index
2d819fc
..
451b541
100644
(file)
--- a/
drivers/net/tokenring/olympic.c
+++ b/
drivers/net/tokenring/olympic.c
@@
-1055,7
+1055,7
@@
static int olympic_xmit(struct sk_buff *skb, struct net_device *dev)
return 0;
} else {
spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
}