---

yaml --- r: 63427 b: refs/heads/master c: 3764070 h: refs/heads/master i: 63425: 0e3d4bb 63423: 8f2b8cd v: v3
git-mirror · Jul 31, 2007 · 37b9836 · 37b9836
1 parent 482f110
commit 37b9836
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87966541ef15d28572c8a3caaec359801625228
+refs/heads/master: 376407039c26caacc3e433437d25516ba8f3adc9
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
@@ -513,11 +513,8 @@ void ip_options_undo(struct ip_options * opt)
 
 static struct ip_options *ip_options_get_alloc(const int optlen)
 {
-	struct ip_options *opt = kmalloc(sizeof(*opt) + ((optlen + 3) & ~3),
-					 GFP_KERNEL);
-	if (opt)
-		memset(opt, 0, sizeof(*opt));
-	return opt;
+	return kzalloc(sizeof(struct ip_options) + ((optlen + 3) & ~3),
+		       GFP_KERNEL);
 }
 
 static int ip_options_get_finish(struct ip_options **optp,