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 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
net
/
mac89x0.c
diff --git
a/drivers/net/mac89x0.c
b/drivers/net/mac89x0.c
index
dab4533
..
149e0ed
100644
(file)
--- a/
drivers/net/mac89x0.c
+++ b/
drivers/net/mac89x0.c
@@
-411,7
+411,7
@@
net_send_packet(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
dev_kfree_skb (skb);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/* The typical workload of the driver: