fm10k: IS_ENABLED() is not appropriate for boolean kconfig option
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 9 Dec 2015 01:20:49 +0000 (17:20 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 22 Dec 2015 13:23:17 +0000 (05:23 -0800)
Tri-states need 'if IS_ENABLED()', booleans should use 'ifdef'.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

index 6fdb78264f9fb6a816f50ac4115bd78659a080fd..662569d5b7c01a0af679fcecb147270a9c8f0c7c 100644 (file)
@@ -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;