commit f4d5392e5ff58bf706c47906b54cc4b7333fc22e
author Amerigo Wang <amwang@redhat.com> Mon Oct 29 17:22:28 2012 +0000
committer David S. Miller <davem@davemloft.net> Thu Nov 01 12:41:35 2012 -0400
tree 08429f07f3a701cf7583b163d846d447df63a6b1
parent 07a936260a94ae4798527ce8f79d4f3b589ab8a3

vlan: use IS_ENABLED()

#if defined(CONFIG_FOO) || defined(CONFIG_FOO_MODULE)

can be replaced by

#if IS_ENABLED(CONFIG_FOO)

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/8021q/vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index ee07072..30ee4bc 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -294,7 +294,7 @@
 	else
 		vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;
 
-#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#if IS_ENABLED(CONFIG_FCOE)
 	vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
 #endif