projects
/
linux-2.6-block.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/mason/btrfs-unstable
[linux-2.6-block.git]
/
drivers
/
net
/
rrunner.c
diff --git
a/drivers/net/rrunner.c
b/drivers/net/rrunner.c
index d890829a9acc61f678e06c273a031976603f010f..81dbcbb910f4099c0644c9222ed773f8be3df9c9 100644
(file)
--- a/
drivers/net/rrunner.c
+++ b/
drivers/net/rrunner.c
@@
-1425,7
+1425,7
@@
static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (!(new_skb = dev_alloc_skb(len + 8))) {
dev_kfree_skb(skb);
netif_wake_queue(dev);
- return
-EBUSY
;
+ return
NETDEV_TX_OK
;
}
skb_reserve(new_skb, 8);
skb_put(new_skb, len);