projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[cascardo/linux.git]
/
drivers
/
net
/
ni5010.c
diff --git
a/drivers/net/ni5010.c
b/drivers/net/ni5010.c
index
2a8da47
..
462d20f
100644
(file)
--- a/
drivers/net/ni5010.c
+++ b/
drivers/net/ni5010.c
@@
-463,7
+463,7
@@
static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev)
hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len);
dev->trans_start = jiffies;
dev_kfree_skb (skb);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*