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
/
arm
/
at91_ether.c
diff --git
a/drivers/net/arm/at91_ether.c
b/drivers/net/arm/at91_ether.c
index
5041d10
..
c8bc60a
100644
(file)
--- a/
drivers/net/arm/at91_ether.c
+++ b/
drivers/net/arm/at91_ether.c
@@
-834,7
+834,7
@@
static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
we free and return(0) or don't free and return 1 */
}
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*