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
/
sonic.c
diff --git
a/drivers/net/sonic.c
b/drivers/net/sonic.c
index
753a1fb
..
9599ce7
100644
(file)
--- a/
drivers/net/sonic.c
+++ b/
drivers/net/sonic.c
@@
-211,7
+211,7
@@
static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
length = skb->len;
if (length < ETH_ZLEN) {
if (skb_padto(skb, ETH_ZLEN))
- return
0
;
+ return
NETDEV_TX_OK
;
length = ETH_ZLEN;
}
@@
-265,7
+265,7
@@
static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*