git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ 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
[safe/jmp/linux-2.6]
/
drivers
/
misc
/
sgi-xp
/
xpnet.c
diff --git
a/drivers/misc/sgi-xp/xpnet.c
b/drivers/misc/sgi-xp/xpnet.c
index
5d778ec
..
212da9a
100644
(file)
--- a/
drivers/misc/sgi-xp/xpnet.c
+++ b/
drivers/misc/sgi-xp/xpnet.c
@@
-436,7
+436,7
@@
xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (skb->data[0] == 0x33) {
dev_kfree_skb(skb);
- return
0;
/* nothing needed to be done */
+ return
NETDEV_TX_OK;
/* nothing needed to be done */
}
/*
@@
-503,7
+503,7
@@
xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
- return
0
;
+ return
NETDEV_TX_OK
;
}
/*