Commit f548484c authored by Bruce Allan's avatar Bruce Allan Committed by Tim Gardner

fm10k: IS_ENABLED() is not appropriate for boolean kconfig option

BugLink: http://bugs.launchpad.net/bugs/1536475

Tri-states need 'if IS_ENABLED()', booleans should use 'ifdef'.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 0d722ec8)
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent be6d5c88
......@@ -20,7 +20,7 @@
#include "fm10k.h"
#include <linux/vmalloc.h>
#if IS_ENABLED(CONFIG_FM10K_VXLAN)
#ifdef CONFIG_FM10K_VXLAN
#include <net/vxlan.h>
#endif /* CONFIG_FM10K_VXLAN */
......@@ -556,11 +556,11 @@ int fm10k_open(struct net_device *netdev)
if (err)
goto err_set_queues;
#if IS_ENABLED(CONFIG_FM10K_VXLAN)
#ifdef CONFIG_FM10K_VXLAN
/* update VXLAN port configuration */
vxlan_get_rx_port(netdev);
#endif
fm10k_up(interface);
return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment