From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 2 Feb 2009 06:24:43 +0000 (-0800)
Subject: ipv4: Delete redundant sk_family assignment
X-Git-Tag: v2.6.30-rc1~662^2~840
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f15fbcd7d857ca2ea20b57ba6dfe63aab89d0b8b;p=karo-tx-linux.git

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 957cd054732c..c79087719df0 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;