2 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 092fcfa9ceb9..10709cbe96fd 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -20,7 +20,6 @@
 #define RPCDBG_BIND             0x0020
 #define RPCDBG_SCHED            0x0040
 #define RPCDBG_TRANS            0x0080
-#define RPCDBG_SVCSOCK          0x0100
 #define RPCDBG_SVCXPRT          0x0100
 #define RPCDBG_SVCDSP           0x0200
 #define RPCDBG_MISC             0x0400
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index a53e0fa855d2..1878cbe1aa4f 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -10,11 +10,13 @@
 #define SUNRPC_SVCSOCK_H
 
 #include <linux/sunrpc/svc.h>
+#include <linux/sunrpc/svc_xprt.h>
 
 /*
  * RPC server socket.
  */
 struct svc_sock {
+        struct svc_xprt         sk_xprt;
         struct list_head        sk_ready;       /* list of ready sockets */
         struct list_head        sk_list;        /* list of all sockets */
         struct socket *         sk_sock;        /* berkeley socket layer */
@@ -78,6 +80,8 @@ int		svc_addsock(struct svc_serv *serv,
                             int fd,
                             char *name_return,
                             int *proto);
+void            svc_init_xprt_sock(void);
+void            svc_cleanup_xprt_sock(void);
 
 /*
  * svc_makesock socket characteristics