1 files changed, 17 insertions, 25 deletions

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index d11cedd14f0f..30b17b3bc1a9 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -19,25 +19,11 @@
 
 #ifdef __KERNEL__
 
-extern unsigned int xprt_udp_slot_table_entries;
-extern unsigned int xprt_tcp_slot_table_entries;
-
 #define RPC_MIN_SLOT_TABLE      (2U)
 #define RPC_DEF_SLOT_TABLE      (16U)
 #define RPC_MAX_SLOT_TABLE      (128U)
 
 /*
- * Parameters for choosing a free port
- */
-extern unsigned int xprt_min_resvport;
-extern unsigned int xprt_max_resvport;
-
-#define RPC_MIN_RESVPORT        (1U)
-#define RPC_MAX_RESVPORT        (65535U)
-#define RPC_DEF_MIN_RESVPORT    (665U)
-#define RPC_DEF_MAX_RESVPORT    (1023U)
-
-/*
  * This describes a timeout strategy
  */
 struct rpc_timeout {
@@ -53,6 +39,10 @@ enum rpc_display_format_t {
         RPC_DISPLAY_PORT,
         RPC_DISPLAY_PROTO,
         RPC_DISPLAY_ALL,
+        RPC_DISPLAY_HEX_ADDR,
+        RPC_DISPLAY_HEX_PORT,
+        RPC_DISPLAY_UNIVERSAL_ADDR,
+        RPC_DISPLAY_NETID,
         RPC_DISPLAY_MAX,
 };
 
@@ -196,14 +186,22 @@ struct rpc_xprt {
         char *                  address_strings[RPC_DISPLAY_MAX];
 };
 
-struct rpc_xprtsock_create {
-        int                     proto;          /* IPPROTO_UDP or IPPROTO_TCP */
+struct xprt_create {
+        int                     ident;          /* XPRT_TRANSPORT identifier */
         struct sockaddr *       srcaddr;        /* optional local address */
         struct sockaddr *       dstaddr;        /* remote peer address */
         size_t                  addrlen;
         struct rpc_timeout *    timeout;        /* optional timeout parameters */
 };
 
+struct xprt_class {
+        struct list_head        list;
+        int                     ident;          /* XPRT_TRANSPORT identifier */
+        struct rpc_xprt *       (*setup)(struct xprt_create *);
+        struct module           *owner;
+        char                    name[32];
+};
+
 /*
  * Transport operations used by ULPs
  */
@@ -212,7 +210,7 @@ void			xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long
 /*
  * Generic internal transport functions
  */
-struct rpc_xprt *       xprt_create_transport(struct rpc_xprtsock_create *args);
+struct rpc_xprt         *xprt_create_transport(struct xprt_create *args);
 void                    xprt_connect(struct rpc_task *task);
 void                    xprt_reserve(struct rpc_task *task);
 int                     xprt_reserve_xprt(struct rpc_task *task);
@@ -235,6 +233,8 @@ static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *
 /*
  * Transport switch helper functions
  */
+int                     xprt_register_transport(struct xprt_class *type);
+int                     xprt_unregister_transport(struct xprt_class *type);
 void                    xprt_set_retrans_timeout_def(struct rpc_task *task);
 void                    xprt_set_retrans_timeout_rtt(struct rpc_task *task);
 void                    xprt_wake_pending_tasks(struct rpc_xprt *xprt, int status);
@@ -248,14 +248,6 @@ void			xprt_release_rqst_cong(struct rpc_task *task);
 void                    xprt_disconnect(struct rpc_xprt *xprt);
 
 /*
- * Socket transport setup operations
- */
-struct rpc_xprt *       xs_setup_udp(struct rpc_xprtsock_create *args);
-struct rpc_xprt *       xs_setup_tcp(struct rpc_xprtsock_create *args);
-int                     init_socket_xprt(void);
-void                    cleanup_socket_xprt(void);
-
-/*
  * Reserved bit positions in xprt->state
  */
 #define XPRT_LOCKED             (0)