projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
net
/
lib82596.c
diff --git
a/drivers/net/lib82596.c
b/drivers/net/lib82596.c
index
070fa45
..
51e11c3
100644
(file)
--- a/
drivers/net/lib82596.c
+++ b/
drivers/net/lib82596.c
@@
-983,7
+983,7
@@
static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (length < ETH_ZLEN) {
if (skb_padto(skb, ETH_ZLEN))
- return
0
;
+ return
NETDEV_TX_OK
;
length = ETH_ZLEN;
}
@@
-1028,7
+1028,7
@@
static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
netif_start_queue(dev);
- return
0
;
+ return
NETDEV_TX_OK
;
}
static void print_eth(unsigned char *add, char *str)