linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / atm / lec.c

diff --git a/net/atm/lec.c b/net/atm/lec.c
index b4aa489..c4fc722 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/capability.h>
@@ -1811,11 +1812,12 @@ make_entry(struct lec_priv *priv, unsigned char *mac_addr)
 {
         struct lec_arp_table *to_return;
 
-        to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
+        to_return = kmalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
         if (!to_return) {
                 printk("LEC: Arp entry kmalloc failed\n");
                 return NULL;
         }
+        memset(to_return, 0, sizeof(struct lec_arp_table));
         memcpy(to_return->mac_addr, mac_addr, ETH_ALEN);
         init_timer(&to_return->timer);
         to_return->timer.function = lec_arp_expire_arp;