From 15b8832f7ae9207552805fff345df9bb6013b8d2 Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Fri, 26 Aug 2011 09:45:41 +0000
Subject: [PATCH] --- yaml --- r: 265586 b: refs/heads/master c:
 3c9c36bcedd426f2be2826da43e5163de61735f7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 871e5b0fda92..eee35a21c000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc7e3a6a2a2464cf96dee329f7c58fe8c230d97
+refs/heads/master: 3c9c36bcedd426f2be2826da43e5163de61735f7
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 125f9fb8ece4..0a7f619f284e 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -922,11 +922,15 @@ struct net_device_ops {
 						       u16 xid,
 						       struct scatterlist *sgl,
 						       unsigned int sgc);
+#endif
+
+#if defined(CONFIG_LIBFCOE) || defined(CONFIG_LIBFCOE_MODULE)
 #define NETDEV_FCOE_WWNN 0
 #define NETDEV_FCOE_WWPN 1
 	int			(*ndo_fcoe_get_wwn)(struct net_device *dev,
 						    u64 *wwn, int type);
 #endif
+
 #ifdef CONFIG_RFS_ACCEL
 	int			(*ndo_rx_flow_steer)(struct net_device *dev,
 						     const struct sk_buff *skb,