uek-rpm: configs: Adjust config for new rpcrdma.ko module

Upstream merged svcrdma.ko and xprtrdma.ko into a single module,
rpcrdma.ko, in order to support bi-directional RPC/RDMA. The
old modules were controlled by separate Kconfig options, which
have been replaced by a single config option controlling both.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 5bfe40728773e852db92caa8009ee551620e7933..81a99e401517616448b6bbb1aa7916e5f6c875c0 100644 (file)
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -5686,8 +5686,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y

diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index f84ef5bb3d8c8bfd4b0738d1858cf73fd9638b24..327d8a954ac1214cd6e7416c38a6d090995b7fdd 100644 (file)
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -5679,8 +5679,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y

diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64
index 4d9db4a0672dbbd105263d7cc381e42f6fcac222..c5a640122c98121b2644f4fa883cc4edd4e2e567 100644 (file)
--- a/uek-rpm/ol7/config-x86_64
+++ b/uek-rpm/ol7/config-x86_64
@@ -5834,8 +5834,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y

diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index 8e39cd05b094421cf675ac8dba22fe9f5f5aa32f..123977d08e19b41951ecf1a353d86ad4f5e2581d 100644 (file)
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -5825,8 +5825,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y