[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:38 CEST 2011

The following commit has been merged in the master branch:
commit 1b38bed562317701760b84cad12749985ceffb8b
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 10 11:17:40 2011 +0200

    batman-adv: Use kzalloc rather than kmalloc followed by memset with 0
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 61605a0..6e03635 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -273,11 +273,10 @@ static void gw_node_add(struct bat_priv *bat_priv,
 	struct gw_node *gw_node;
 	int down, up;
-	gw_node = kmalloc(sizeof(struct gw_node), GFP_ATOMIC);
+	gw_node = kzalloc(sizeof(struct gw_node), GFP_ATOMIC);
 	if (!gw_node)
-	memset(gw_node, 0, sizeof(struct gw_node));
 	gw_node->orig_node = orig_node;
 	atomic_set(&gw_node->refcount, 1);


More information about the linux-merge mailing list