diff --git a/[refs] b/[refs] index c52ad074e2bc..ea859c7eb2ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24dd1fa184595ff095a92de807fdf029b2632673 +refs/heads/master: f15fbcd7d857ca2ea20b57ba6dfe63aab89d0b8b diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c index 957cd054732c..c79087719df0 100644 --- a/trunk/net/ipv4/af_inet.c +++ b/trunk/net/ipv4/af_inet.c @@ -369,7 +369,6 @@ static int inet_create(struct net *net, struct socket *sock, int 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;