diff options
Diffstat (limited to 'drivers/net/znet.c')
-rw-r--r-- | drivers/net/znet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index 3ac047bc727d..9f0291f35290 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -85,7 +85,6 @@ | |||
85 | - Understand why some traffic patterns add a 1s latency... | 85 | - Understand why some traffic patterns add a 1s latency... |
86 | */ | 86 | */ |
87 | 87 | ||
88 | #include <linux/config.h> | ||
89 | #include <linux/module.h> | 88 | #include <linux/module.h> |
90 | #include <linux/kernel.h> | 89 | #include <linux/kernel.h> |
91 | #include <linux/string.h> | 90 | #include <linux/string.h> |
@@ -544,8 +543,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
544 | printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name); | 543 | printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name); |
545 | 544 | ||
546 | if (length < ETH_ZLEN) { | 545 | if (length < ETH_ZLEN) { |
547 | skb = skb_padto(skb, ETH_ZLEN); | 546 | if (skb_padto(skb, ETH_ZLEN)) |
548 | if (skb == NULL) | ||
549 | return 0; | 547 | return 0; |
550 | length = ETH_ZLEN; | 548 | length = ETH_ZLEN; |
551 | } | 549 | } |