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
/
sunbmac.c
diff --git
a/drivers/net/sunbmac.c
b/drivers/net/sunbmac.c
index
5017d7f
..
536cf7e
100644
(file)
--- a/
drivers/net/sunbmac.c
+++ b/
drivers/net/sunbmac.c
@@
-984,7
+984,7
@@
static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
- return
0
;
+ return
NETDEV_TX_OK
;
}
static struct net_device_stats *bigmac_get_stats(struct net_device *dev)