aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-11-01 00:38:43 -0700
committerDavid S. Miller <davem@davemloft.net>2007-11-01 00:38:43 -0700
commit154adbc8469ff21fbf5c958446ee92dbaab01be1 (patch)
treed8619ac46e2ed551611bffa1a0166587a77a045b /net
parent8fd1d178a3f177777707ee782f12d93e9a7eb5e5 (diff)
downloadkernel_samsung_smdk4412-154adbc8469ff21fbf5c958446ee92dbaab01be1.zip
kernel_samsung_smdk4412-154adbc8469ff21fbf5c958446ee92dbaab01be1.tar.gz
kernel_samsung_smdk4412-154adbc8469ff21fbf5c958446ee92dbaab01be1.tar.bz2
[NET]: Remove bogus zero_it argument from sk_alloc
At this point nobody calls the sk_alloc(() with zero_it == 0, so remove unneeded checks from it. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 4f4708a..6046fc6 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -931,21 +931,16 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
{
struct sock *sk;
- if (zero_it)
- priority |= __GFP_ZERO;
-
- sk = sk_prot_alloc(prot, priority, family);
+ sk = sk_prot_alloc(prot, priority | __GFP_ZERO, family);
if (sk) {
- if (zero_it) {
- sk->sk_family = family;
- /*
- * See comment in struct sock definition to understand
- * why we need sk_prot_creator -acme
- */
- sk->sk_prot = sk->sk_prot_creator = prot;
- sock_lock_init(sk);
- sk->sk_net = get_net(net);
- }
+ sk->sk_family = family;
+ /*
+ * See comment in struct sock definition to understand
+ * why we need sk_prot_creator -acme
+ */
+ sk->sk_prot = sk->sk_prot_creator = prot;
+ sock_lock_init(sk);
+ sk->sk_net = get_net(net);
}
return sk;