Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d5392e authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

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: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07a93626

net/8021q/vlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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

net/8021q/vlan_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa) 
	return err;

}



#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#if IS_ENABLED(CONFIG_FCOE)

static int vlan_dev_fcoe_ddp_setup(struct net_device *dev, u16 xid,

				   struct scatterlist *sgl, unsigned int sgc)

{
@@ -564,7 +564,7 @@ static int vlan_dev_init(struct net_device *dev) 
	if (is_zero_ether_addr(dev->broadcast))

		memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);



#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#if IS_ENABLED(CONFIG_FCOE)

	dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;

#endif
@@ -741,7 +741,7 @@ static const struct net_device_ops vlan_netdev_ops = { 
	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

	.ndo_get_stats64	= vlan_dev_get_stats64,

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#if IS_ENABLED(CONFIG_FCOE)

	.ndo_fcoe_ddp_setup	= vlan_dev_fcoe_ddp_setup,

	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,

	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,