ipv4: Delete redundant sk_family assignment

ipv4: Delete redundant sk_family assignment

[Herbert Xu]

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>

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;

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: ipv4: Delete redundant sk_family assignment

[David Miller]

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.