From 37b9836539421580af669307f84d10d218e190e3 Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Tue, 31 Jul 2007 14:06:45 -0700 Subject: [PATCH] --- yaml --- r: 63427 b: refs/heads/master c: 376407039c26caacc3e433437d25516ba8f3adc9 h: refs/heads/master i: 63425: 0e3d4bbd2fee3652f5dd8d77d380607d1d18ec7f 63423: 8f2b8cd542cfda113a8a288f829f1f59a1152be6 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_options.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d243eef13696..6807480abc54 100644 --- 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 index 251346828cb4..2f14745a9e1f 100644 --- 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,