Patchwork ipv4: Delete redundant sk_family assignment

login
register
mail settings
Submitter Herbert Xu
Date Feb. 2, 2009, 6:19 a.m.
Message ID <20090202061918.GA23990@gondor.apana.org.au>
Download mbox | patch
Permalink /patch/21542/
State Accepted
Delegated to: David Miller
Headers show

Comments

Herbert Xu - Feb. 2, 2009, 6:19 a.m.
Hi Dave:

Here's a random clean-up that I did while working on tun accounting.

ipv4: Delete redundant sk_family assignment

sk_alloc now sets sk_family so this is redundant.  In fact it caught
my eye because sock_init_data already uses sk_family so this is too
late anyway.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
David Miller - Feb. 2, 2009, 6:24 a.m.
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 2 Feb 2009 17:19:18 +1100

> ipv4: Delete redundant sk_family assignment
> 
> sk_alloc now sets sk_family so this is redundant.  In fact it caught
> my eye because sock_init_data already uses sk_family so this is too
> late anyway.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied, thanks Herbert.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index d6770f2..7b3ca13 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -369,7 +369,6 @@  lookup_protocol:
 	sock_init_data(sock, sk);
 
 	sk->sk_destruct	   = inet_sock_destruct;
-	sk->sk_family	   = PF_INET;
 	sk->sk_protocol	   = protocol;
 	sk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;