Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 2 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index c10e18a49b96..693f02eca6d6 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -417,12 +417,11 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
         struct tipc_msg *msg;
         char *if_name;
 
-        l_ptr = (struct link *)kmalloc(sizeof(*l_ptr), GFP_ATOMIC);
+        l_ptr = kzalloc(sizeof(*l_ptr), GFP_ATOMIC);
         if (!l_ptr) {
                 warn("Link creation failed, no memory\n");
                 return NULL;
         }
-        memset(l_ptr, 0, sizeof(*l_ptr));
 
         l_ptr->addr = peer;
         if_name = strchr(b_ptr->publ.name, ':') + 1;