inet: prepare sock_edemux() & sock_gen_put() for new SYN_RECV state
authorEric Dumazet <edumazet@google.com>
Thu, 12 Mar 2015 23:44:08 +0000 (16:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Mar 2015 02:58:13 +0000 (22:58 -0400)
sock_edemux() & sock_gen_put() should be ready to cope with request socks.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/request_sock.h
include/net/sock.h
net/core/sock.c
net/ipv4/inet_hashtables.c

index e255ecf..3275cf3 100644 (file)
@@ -77,6 +77,11 @@ static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *op
        return req;
 }
 
+static inline struct request_sock *inet_reqsk(struct sock *sk)
+{
+       return (struct request_sock *)sk;
+}
+
 static inline void __reqsk_free(struct request_sock *req)
 {
        kmem_cache_free(req->rsk_ops->slab, req);
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge