[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1384090080-1862-1-git-send-email-ogerlitz@mellanox.com>
Date: Sun, 10 Nov 2013 15:28:00 +0200
From: Or Gerlitz <ogerlitz@...lanox.com>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, amirv@...lanox.com,
Eyal Perry <eyalpe@...lanox.com>,
Or Gerlitz <ogerlitz@...lanox.com>
Subject: [PATCH net-next FIX] RDMA/cma: Fix build breakage when infiniband is built-in
From: Eyal Perry <eyalpe@...lanox.com>
Commit eb072c4 ("RDMA/cma: Set IBoE SL (user-priority) by egress map when using
vlans"), broke the build when CONFIG_VLAN_8021Q=m and CONFIG_INFINIBAND=y,
because the rdma_cm module attempted to call vlan_dev_get_egress_qos_mask()
which in that case is a modular code being called from built-in kernel code.
Fix this by adding a Kconfig dependency to prevent the rdma_cm code from being
built in when 8021Q is built modular, in a similar manner we do with IPv6.
Signed-off-by: Eyal Perry <eyalpe@...lanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@...lanox.com>
---
Dave, this fixes an issue with the mentioned commit which is in net-next
drivers/infiniband/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index b84791f..079dfe4 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -51,6 +51,7 @@ config INFINIBAND_ADDR_TRANS
bool
depends on INET
depends on !(INFINIBAND = y && IPV6 = m)
+ depends on !(INFINIBAND = y && VLAN_8021Q = m)
default y
source "drivers/infiniband/hw/mthca/Kconfig"
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists