> 
> What is being done in the parent directory has a bug, you're right that far, 
> but
> this is the wrong fix. If you check the 0day failures, it isn't because the
> InfiniBand core isn't enabled, it's because the current menuconfig setup 
> allows
> the IB core to be a module and the staging drivers to be compiled into the
> kernel. That obviously is an invalid condition and it applies to all of the 
> drivers
> in staging right now. The correct fix is to resolve that issue.

That is our conclusion as well.

But how do we do that globally in staging/rdma?

The module setting of INFINIBAND does not seem to carry to the subdirs while 
the following does work.

It seems like this is the easiest fix since this is a temp home for these 
drivers.

Ira


13:54:05 > git di
diff --git a/drivers/staging/rdma/amso1100/Kconfig 
b/drivers/staging/rdma/amso1100/Kconfig
index e6ce5f209e47..809cb14ac6de 100644
--- a/drivers/staging/rdma/amso1100/Kconfig
+++ b/drivers/staging/rdma/amso1100/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_AMSO1100
        tristate "Ammasso 1100 HCA support"
-       depends on PCI && INET
+       depends on PCI && INET && INFINIBAND
        ---help---
          This is a low-level driver for the Ammasso 1100 host
          channel adapter (HCA).
diff --git a/drivers/staging/rdma/hfi1/Kconfig 
b/drivers/staging/rdma/hfi1/Kconfig
index fd25078ee923..97372103e947 100644
--- a/drivers/staging/rdma/hfi1/Kconfig
+++ b/drivers/staging/rdma/hfi1/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_HFI1
        tristate "Intel OPA Gen1 support"
-       depends on X86_64
+       depends on X86_64 && INFINIBAND
        default m
        ---help---
        This is a low-level driver for Intel OPA Gen1 adapter.
diff --git a/drivers/staging/rdma/ipath/Kconfig 
b/drivers/staging/rdma/ipath/Kconfig
index 041ce0634968..12dcd4010a18 100644
--- a/drivers/staging/rdma/ipath/Kconfig
+++ b/drivers/staging/rdma/ipath/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_IPATH
        tristate "QLogic HTX HCA support"
-       depends on 64BIT && NET && HT_IRQ
+       depends on 64BIT && NET && HT_IRQ && INFINIBAND
        ---help---
        This is a driver for the deprecated QLogic Hyper-Transport
        IB host channel adapter (model QHT7140),

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to