diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-01 03:39:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-11-01 03:39:31 -0400 |
commit | 6257ff2177ff02d7f260a7a501876aa41cb9a9f6 (patch) | |
tree | 9d9f80ccf16f3d4ef062e896f62974c5496193ad /net/ipv6/af_inet6.c | |
parent | 154adbc8469ff21fbf5c958446ee92dbaab01be1 (diff) |
[NET]: Forget the zero_it argument of sk_alloc()
Finally, the zero_it argument can be completely removed from
the callers and from the function prototype.
Besides, fix the checkpatch.pl warnings about using the
assignments inside if-s.
This patch is rather big, and it is a part of the previous one.
I splitted it wishing to make the patches more readable. Hope
this particular split helped.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r-- | net/ipv6/af_inet6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 1b1caf3aa1c..ecbd38894fd 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -162,7 +162,7 @@ lookup_protocol: | |||
162 | BUG_TRAP(answer_prot->slab != NULL); | 162 | BUG_TRAP(answer_prot->slab != NULL); |
163 | 163 | ||
164 | err = -ENOBUFS; | 164 | err = -ENOBUFS; |
165 | sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot, 1); | 165 | sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot); |
166 | if (sk == NULL) | 166 | if (sk == NULL) |
167 | goto out; | 167 | goto out; |
168 | 168 | ||