Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 533d1dae authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jason Gunthorpe
Browse files

IB: Revert "remove redundant INFINIBAND kconfig dependencies" 



Several subsystems depend on INFINIBAND_ADDR_TRANS, which in turn depends
on INFINIBAND. However, when with CONFIG_INIFIBAND=m, this leads to a
link error when another driver using it is built-in. The
INFINIBAND_ADDR_TRANS dependency is insufficient here as this is
a 'bool' symbol that does not force anything to be a module in turn.

fs/cifs/smbdirect.o: In function `smbd_disconnect_rdma_work':
smbdirect.c:(.text+0x1e4): undefined reference to `rdma_disconnect'
net/9p/trans_rdma.o: In function `rdma_request':
trans_rdma.c:(.text+0x7bc): undefined reference to `rdma_disconnect'
net/9p/trans_rdma.o: In function `rdma_destroy_trans':
trans_rdma.c:(.text+0x830): undefined reference to `ib_destroy_qp'
trans_rdma.c:(.text+0x858): undefined reference to `ib_dealloc_pd'

Fixes: 9533b292 ("IB: remove redundant INFINIBAND kconfig dependencies")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGreg Thelen <gthelen@google.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 6e04b103

drivers/infiniband/ulp/srpt/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_SRPT

	tristate "InfiniBand SCSI RDMA Protocol target support"

	depends on INFINIBAND_ADDR_TRANS && TARGET_CORE

	depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE

	---help---



	  Support for the SCSI RDMA Protocol (SRP) Target driver. The

drivers/nvme/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config NVME_FABRICS 


config NVME_RDMA

	tristate "NVM Express over Fabrics RDMA host driver"

	depends on INFINIBAND_ADDR_TRANS && BLOCK

	depends on INFINIBAND && INFINIBAND_ADDR_TRANS && BLOCK

	select NVME_CORE

	select NVME_FABRICS

	select SG_POOL

drivers/nvme/target/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config NVME_TARGET_LOOP 


config NVME_TARGET_RDMA

	tristate "NVMe over Fabrics RDMA target support"

	depends on INFINIBAND_ADDR_TRANS

	depends on INFINIBAND && INFINIBAND_ADDR_TRANS

	depends on NVME_TARGET

	select SGL_ALLOC

	help

drivers/staging/lustre/lnet/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ config LNET_SELFTEST 


config LNET_XPRT_IB

	tristate "LNET infiniband support"

	depends on LNET && PCI && INFINIBAND_ADDR_TRANS

	depends on LNET && PCI && INFINIBAND && INFINIBAND_ADDR_TRANS

	default LNET && INFINIBAND

	help

	  This option allows the LNET users to use infiniband as an

fs/cifs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ config CIFS_SMB311 


config CIFS_SMB_DIRECT

	bool "SMB Direct support (Experimental)"

	depends on CIFS=m && INFINIBAND_ADDR_TRANS || CIFS=y && INFINIBAND_ADDR_TRANS=y

	depends on CIFS=m && INFINIBAND && INFINIBAND_ADDR_TRANS || CIFS=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y

	help

	  Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1.

	  SMB Direct allows transferring SMB packets over RDMA. If unsure,