lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] Replace IS_ENABLED(CONFIG_FCOE) in linux/netdevice.h
Date
On platforms that (or configs that do not have PCI support building any
code that includes linux/netdevice.h we see the following warnings:

include/linux/netdevice.h:964:1: warning: "__enabled_CONFIG_FCOE" is not defined [-Wundef]
include/linux/netdevice.h:964:1: warning: "__enabled_CONFIG_FCOE_MODULE" is not defined [-Wundef]

In the case of this file we can trivially fallback to the old school
#if defined(...) syntax.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
To: Robert Love <robert.w.love@intel.com>
To: "James E.J. Bottomley" <JBottomley@parallels.com>
To: "David S. Miller" <davem@davemloft.net>
CC: devel@open-fcoe.org
CC: netdev@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---
include/linux/netdevice.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0eac07c..3e4bbbc 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -961,7 +961,7 @@ struct net_device_ops {
int (*ndo_get_vf_port)(struct net_device *dev,
int vf, struct sk_buff *skb);
int (*ndo_setup_tc)(struct net_device *dev, u8 tc);
-#if IS_ENABLED(CONFIG_FCOE)
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
int (*ndo_fcoe_enable)(struct net_device *dev);
int (*ndo_fcoe_disable)(struct net_device *dev);
int (*ndo_fcoe_ddp_setup)(struct net_device *dev,
@@ -978,7 +978,7 @@ struct net_device_ops {
struct netdev_fcoe_hbainfo *hbainfo);
#endif

-#if IS_ENABLED(CONFIG_LIBFCOE)
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
#define NETDEV_FCOE_WWNN 0
#define NETDEV_FCOE_WWPN 1
int (*ndo_fcoe_get_wwn)(struct net_device *dev,
@@ -1286,7 +1286,7 @@ struct net_device {
struct netdev_tc_txq tc_to_txq[TC_MAX_QUEUE];
u8 prio_tc_map[TC_BITMASK + 1];

-#if IS_ENABLED(CONFIG_FCOE)
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
/* max exchange id for FCoE LRO by ddp */
unsigned int fcoe_ddp_xid;
#endif
--
1.7.7.6


\
 
 \ /
  Last update: 2012-03-16 01:33    [W:0.053 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site