[PATCH] net/9p: limit RDMA to INET

[PATCH] net/9p: limit RDMA to INET

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

linux-next:

Make 9p's RDMA option depend on INET since it uses Infiniband rdma_*
functions and that code depends on INET.  Otherwise 9p can try to
use symbols which don't exist.

ERROR: "rdma_destroy_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_connect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_qp" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_route" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_disconnect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_addr" [net/9p/9pnet_rdma.ko] undefined!

I used an if/endif block so that the menu items would remain
presented together.

Also correct an article adjective.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 net/9p/Kconfig |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- linux-next-20081103.orig/net/9p/Kconfig
+++ linux-next-20081103/net/9p/Kconfig
@@ -13,22 +13,24 @@ menuconfig NET_9P
 
 	  If unsure, say N.
 
+if NET_9P
+
 config NET_9P_VIRTIO
-	depends on NET_9P && EXPERIMENTAL && VIRTIO
+	depends on EXPERIMENTAL && VIRTIO
 	tristate "9P Virtio Transport (Experimental)"
 	help
 	  This builds support for a transports between
 	  guest partitions and a host partition.
 
 config NET_9P_RDMA
-	depends on NET_9P && INFINIBAND && EXPERIMENTAL
+	depends on INET && INFINIBAND && EXPERIMENTAL
 	tristate "9P RDMA Transport (Experimental)"
 	help
-	  This builds support for a RDMA transport.
+	  This builds support for an RDMA transport.
 
 config NET_9P_DEBUG
 	bool "Debug information"
-	depends on NET_9P
 	help
 	  Say Y if you want the 9P subsystem to log debug information.
 
+endif

Re: [PATCH] net/9p: limit RDMA to INET

[Roland Dreier]

 > Make 9p's RDMA option depend on INET since it uses Infiniband rdma_*
 > functions and that code depends on INET.  Otherwise 9p can try to
 > use symbols which don't exist.
 > 
 > ERROR: "rdma_destroy_id" [net/9p/9pnet_rdma.ko] undefined!

Good catch.

 >  config NET_9P_RDMA
 > -	depends on NET_9P && INFINIBAND && EXPERIMENTAL
 > +	depends on INET && INFINIBAND && EXPERIMENTAL

I wonder if there's a way to make this depend on INFINIBAND_ADDR_TRANS
instead of INET, since that's the real dependency to get the rdma_*
symbols.  However INFINIBAND_ADDR_TRANS is a bool that gets set to y iff
INET and INFINIBAND are set, so it's not trivial to make a tristate
depend on it.

Maybe this patch is fine as it is, since the Kconfig dependencies are
unlikely to change anyway...

 - R.