linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / core / dv.c

diff --git a/net/core/dv.c b/net/core/dv.c
index 29ee77f..cf58140 100644 (file)
--- a/net/core/dv.c
+++ b/net/core/dv.c
@@ -55,12 +55,15 @@ int alloc_divert_blk(struct net_device *dev)
 
        dev->divert = NULL;
        if (dev->type == ARPHRD_ETHER) {
-               dev->divert = kzalloc(alloc_size, GFP_KERNEL);
+               dev->divert = (struct divert_blk *)
+                       kmalloc(alloc_size, GFP_KERNEL);
                if (dev->divert == NULL) {
                        printk(KERN_INFO "divert: unable to allocate divert_blk for %s\n",
                               dev->name);
                        return -ENOMEM;
                }
+
+               memset(dev->divert, 0, sizeof(struct divert_blk));
                dev_hold(dev);
        }