diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-10-29 17:22:28 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-01 12:41:35 -0400 |
| commit | f4d5392e5ff58bf706c47906b54cc4b7333fc22e (patch) | |
| tree | 08429f07f3a701cf7583b163d846d447df63a6b1 /net/8021q/vlan.c | |
| parent | 07a936260a94ae4798527ce8f79d4f3b589ab8a3 (diff) | |
| download | blackbird-obmc-linux-f4d5392e5ff58bf706c47906b54cc4b7333fc22e.tar.gz blackbird-obmc-linux-f4d5392e5ff58bf706c47906b54cc4b7333fc22e.zip | |
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>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index ee070722a3a3..30ee4bc0f7cc 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -294,7 +294,7 @@ static void vlan_transfer_features(struct net_device *dev, 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 |
