linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / depca.c

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index b1cbe99..03804cc 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -235,6 +235,7 @@
     =========================================================================
 */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -937,8 +938,11 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (skb->len < 1)
                goto out;
 
-       if (skb_padto(skb, ETH_ZLEN))
-               goto out;
+       if (skb->len < ETH_ZLEN) {
+               skb = skb_padto(skb, ETH_ZLEN);
+               if (skb == NULL)
+                       goto out;
+       }
        
        netif_stop_queue(dev);
 
@@ -1408,7 +1412,7 @@ static int __init depca_mca_probe(struct device *device)
                irq = 11;
                break;
        default:
-               printk("%s: mca_probe IRQ error.  You should never get here (%d).\n", mdev->name, where);
+               printk("%s: mca_probe IRQ error.  You should never get here (%d).\n", dev->name, where);
                return -EINVAL;
        }