2 files changed, 13 insertions, 3 deletions

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index d7b8fcd312cc..30b17b3bc1a9 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -187,7 +187,7 @@ struct rpc_xprt {
 };
 
 struct xprt_create {
-        int                     proto;          /* IPPROTO_UDP or IPPROTO_TCP */
+        int                     ident;          /* XPRT_TRANSPORT identifier */
         struct sockaddr *       srcaddr;        /* optional local address */
         struct sockaddr *       dstaddr;        /* remote peer address */
         size_t                  addrlen;
@@ -196,8 +196,7 @@ struct xprt_create {
 
 struct xprt_class {
         struct list_head        list;
-        unsigned short          family;
-        int                     protocol;
+        int                     ident;          /* XPRT_TRANSPORT identifier */
         struct rpc_xprt *       (*setup)(struct xprt_create *);
         struct module           *owner;
         char                    name[32];
diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
index 9bde77061e4f..2c6c2c2783d8 100644
--- a/include/linux/sunrpc/xprtsock.h
+++ b/include/linux/sunrpc/xprtsock.h
@@ -19,6 +19,17 @@ int		init_socket_xprt(void);
 void            cleanup_socket_xprt(void);
 
 /*
+ * RPC transport identifiers for UDP, TCP
+ *
+ * To preserve compatibility with the historical use of raw IP protocol
+ * id's for transport selection, these are specified with the previous
+ * values. No such restriction exists for new transports, except that
+ * they may not collide with these values (17 and 6, respectively).
+ */
+#define XPRT_TRANSPORT_UDP      IPPROTO_UDP
+#define XPRT_TRANSPORT_TCP      IPPROTO_TCP
+
+/*
  * RPC slot table sizes for UDP, TCP transports
  */
 extern unsigned int xprt_udp_slot_table_entries;