Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6257ff21 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 154adbc8

drivers/net/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int pppoe_create(struct net *net, struct socket *sock) 
	int error = -ENOMEM;

	struct sock *sk;



	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppoe_sk_proto, 1);

	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppoe_sk_proto);

	if (!sk)

		goto out;

drivers/net/pppol2tp.c

+1 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ static int pppol2tp_create(struct net *net, struct socket *sock) 
	int error = -ENOMEM;

	struct sock *sk;



	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppol2tp_sk_proto, 1);

	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppol2tp_sk_proto);

	if (!sk)

		goto out;

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ extern void FASTCALL(release_sock(struct sock *sk)); 


extern struct sock		*sk_alloc(struct net *net, int family,

					  gfp_t priority,

					  struct proto *prot, int zero_it);

					  struct proto *prot);

extern void			sk_free(struct sock *sk);

extern struct sock		*sk_clone(const struct sock *sk,

					  const gfp_t priority);

net/appletalk/ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static int atalk_create(struct net *net, struct socket *sock, int protocol) 
	if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)

		goto out;

	rc = -ENOMEM;

	sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &ddp_proto, 1);

	sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &ddp_proto);

	if (!sk)

		goto out;

	rc = 0;

net/atm/common.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family) 
	sock->sk = NULL;

	if (sock->type == SOCK_STREAM)

		return -EINVAL;

	sk = sk_alloc(net, family, GFP_KERNEL, &vcc_proto, 1);

	sk = sk_alloc(net, family, GFP_KERNEL, &vcc_proto);

	if (!sk)

		return -ENOMEM;

	sock_init_data(sock, sk);