Auto merge with /home/aegl/GIT/linus

1 files changed, 4 insertions, 0 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index a9ef3a6a13f3..e593af5b1ecc 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -484,6 +484,8 @@ extern void sk_stream_kill_queues(struct sock *sk);
 
 extern int sk_wait_data(struct sock *sk, long *timeo);
 
+struct request_sock_ops;
+
 /* Networking protocol blocks we attach to sockets.
  * socket layer -> transport layer interface
  * transport -> network interface is defined by struct inet_proto
@@ -547,6 +549,8 @@ struct proto {
         kmem_cache_t            *slab;
         unsigned int            obj_size;
 
+        struct request_sock_ops *rsk_prot;
+
         struct module           *owner;
 
         char                    name[32];