git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
znet.c
diff --git
a/drivers/net/znet.c
b/drivers/net/znet.c
index
9f0291f
..
3ac047b
100644
(file)
--- a/
drivers/net/znet.c
+++ b/
drivers/net/znet.c
@@
-85,6
+85,7
@@
- Understand why some traffic patterns add a 1s latency...
*/
- Understand why some traffic patterns add a 1s latency...
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@
-543,7
+544,8
@@
static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)
printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name);
if (length < ETH_ZLEN) {
printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name);
if (length < ETH_ZLEN) {
- if (skb_padto(skb, ETH_ZLEN))
+ skb = skb_padto(skb, ETH_ZLEN);
+ if (skb == NULL)
return 0;
length = ETH_ZLEN;
}
return 0;
length = ETH_ZLEN;
}