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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
pcmcia
/
nmclan_cs.c
diff --git
a/drivers/net/pcmcia/nmclan_cs.c
b/drivers/net/pcmcia/nmclan_cs.c
index
36de91b
..
dd60590
100644
(file)
--- a/
drivers/net/pcmcia/nmclan_cs.c
+++ b/
drivers/net/pcmcia/nmclan_cs.c
@@
-990,7
+990,7
@@
static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb);
- return
0
;
+ return
NETDEV_TX_OK
;
} /* mace_start_xmit */
/* ----------------------------------------------------------------------------