[PATCH net-next] qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'

[PATCH net-next] qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'

[Shahed Shaikh]

From: Shahed Shaikh <shahed.shaikh@qlogic.com>

Commit 2b3d7b758c687("qlcnic: Add VXLAN Rx offload support") uses
vxlan_get_rx_port() which caused build failure when VXLAN=m.

This patch fixes the build failure by adding dependency on VXLAN
in Kconfig of qlcnic module and use vxlan_get_rx_port() accordingly.

Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
Hi David,

Please apply this patch to net-next.

Thanks,
Shahed
---
 drivers/net/ethernet/qlogic/Kconfig              |   10 ++++++++++
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |    2 ++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index f59e6be..c14bd31 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -56,6 +56,16 @@ config QLCNIC_DCB
 	  mode of DCB is supported. PG and PFC values are related only
 	  to Tx.
 
+config QLCNIC_VXLAN
+	bool "Virtual eXtensible Local Area Network (VXLAN) offload support"
+	default n
+	depends on QLCNIC && VXLAN && !(QLCNIC=y && VXLAN=m)
+	---help---
+	  This enables hardware offload support for VXLAN protocol over QLogic's
+	  84XX series adapters.
+	  Say Y here if you want to enable hardware offload support for
+	  Virtual eXtensible Local Area Network (VXLAN) in the driver.
+
 config QLGE
 	tristate "QLogic QLGE 10Gb Ethernet Driver Support"
 	depends on PCI
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 79be451..d341f65 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1975,8 +1975,10 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
 
 	qlcnic_create_sysfs_entries(adapter);
 
+#ifdef CONFIG_QLCNIC_VXLAN
 	if (qlcnic_encap_rx_offload(adapter))
 		vxlan_get_rx_port(netdev);
+#endif
 
 	adapter->is_up = QLCNIC_ADAPTER_UP_MAGIC;
 	return 0;
-- 
1.5.6

Re: [PATCH net-next] qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'

[David Miller]

From: Shahed Shaikh <shahed.shaikh@qlogic.com>
Date: Sun, 30 Mar 2014 10:42:25 -0400

> From: Shahed Shaikh <shahed.shaikh@qlogic.com>
> 
> Commit 2b3d7b758c687("qlcnic: Add VXLAN Rx offload support") uses
> vxlan_get_rx_port() which caused build failure when VXLAN=m.
> 
> This patch fixes the build failure by adding dependency on VXLAN
> in Kconfig of qlcnic module and use vxlan_get_rx_port() accordingly.
> 
> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
> ---
> Hi David,
> 
> Please apply this patch to net-next.

Do this properly, don't just CPP protect the symbol that fails.

Look at how I40E_VXLAN is used, it protect everything from the
ndo_*() ops to the surrounding support code.

RE: [PATCH net-next] qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'

[Shahed Shaikh]

> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Tuesday, April 01, 2014 2:00 AM
> To: Shahed Shaikh
> Cc: netdev; Dept-HSG Linux NIC Dev
> Subject: Re: [PATCH net-next] qlcnic: Fix build failure due to undefined
> reference to `vxlan_get_rx_port'
> 
> From: Shahed Shaikh <shahed.shaikh@qlogic.com>
> Date: Sun, 30 Mar 2014 10:42:25 -0400
> 
> > From: Shahed Shaikh <shahed.shaikh@qlogic.com>
> >
> > Commit 2b3d7b758c687("qlcnic: Add VXLAN Rx offload support") uses
> > vxlan_get_rx_port() which caused build failure when VXLAN=m.
> >
> > This patch fixes the build failure by adding dependency on VXLAN in
> > Kconfig of qlcnic module and use vxlan_get_rx_port() accordingly.
> >
> > Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
> > ---
> > Hi David,
> >
> > Please apply this patch to net-next.
> 
> Do this properly, don't just CPP protect the symbol that fails.
> 
> Look at how I40E_VXLAN is used, it protect everything from the
> ndo_*() ops to the surrounding support code.

Hi David,

Looks like net-next is closed. Please let me know if I can send the revised version of this patch as per your suggestion.

Thanks,
Shahed

Re: [PATCH net-next] qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'

[David Miller]

From: Shahed Shaikh <shahed.shaikh@qlogic.com>
Date: Mon, 31 Mar 2014 23:33:47 +0000

> Looks like net-next is closed. Please let me know if I can send the
> revised version of this patch as per your suggestion.

It's a bug fix, of course you can submit it.