inet: introduce ireq_family

Before inserting request socks into general hash table,
fill their socket family.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 9d6470c..b3053fd 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -82,6 +82,7 @@ struct inet_request_sock {
 #define ireq_net               req.__req_common.skc_net
 #define ireq_state             req.__req_common.skc_state
 #define ireq_refcnt            req.__req_common.skc_refcnt
+#define ireq_family            req.__req_common.skc_family
 
        kmemcheck_bitfield_begin(flags);
        u16                     snd_wscale : 4,

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index f695874..8f6f400 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -642,6 +642,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        ireq->ir_loc_addr = ip_hdr(skb)->daddr;
        ireq->ir_rmt_addr = ip_hdr(skb)->saddr;
        write_pnet(&ireq->ireq_net, sock_net(sk));
+       ireq->ireq_family = AF_INET;
 
        /*
         * Step 3: Process LISTEN state

diff --cc net/dccp/ipv6.c
Simple merge

diff --cc net/ipv4/inet_diag.c
Simple merge

diff --cc net/ipv4/syncookies.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/syncookies.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge