Merge branches 'release' and 'dmi' into release

[linux-2.6-omap-h63xx.git] / include / linux / sunrpc / xprtsock.h

diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
index 9bde77061e4f4d31a8ba7c486402a1974c2e32df..c2a46c45c8f75a3dab16327b78651501e1bd5740 100644 (file)
--- a/include/linux/sunrpc/xprtsock.h
+++ b/include/linux/sunrpc/xprtsock.h
@@ -9,15 +9,20 @@
 
 #ifdef __KERNEL__
 
-/*
- * Socket transport setup operations
- */
-struct rpc_xprt *xs_setup_udp(struct xprt_create *args);
-struct rpc_xprt *xs_setup_tcp(struct xprt_create *args);
-
 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
  */