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

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

ipv6: 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 cc535dfb

net/ipv6/addrconf.c

+10 −10
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 
	if (dev->flags & (IFF_NOARP | IFF_LOOPBACK))

		ndev->cnf.accept_dad = -1;



#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

	if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) {

		pr_info("%s: Disabled Multicast RS\n", dev->name);

		ndev->cnf.rtr_solicits = 0;
@@ -1838,7 +1838,7 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, struct net_device *dev, 
	   This thing is done here expecting that the whole

	   class of non-broadcast devices need not cloning.

	 */

#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

	if (dev->type == ARPHRD_SIT && (dev->flags & IFF_POINTOPOINT))

		cfg.fc_flags |= RTF_NONEXTHOP;

#endif
@@ -1898,7 +1898,7 @@ static void addrconf_add_mroute(struct net_device *dev) 
	ip6_route_add(&cfg);

}



#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

static void sit_route_add(struct net_device *dev)

{

	struct fib6_config cfg = {
@@ -2250,7 +2250,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg) 
	if (dev == NULL)

		goto err_exit;



#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

	if (dev->type == ARPHRD_SIT) {

		const struct net_device_ops *ops = dev->netdev_ops;

		struct ifreq ifr;
@@ -2461,7 +2461,7 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr, 
	}

}



#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

static void sit_add_v4_addrs(struct inet6_dev *idev)

{

	struct in6_addr addr;
@@ -2580,7 +2580,7 @@ static void addrconf_dev_config(struct net_device *dev) 
		addrconf_add_linklocal(idev, &addr);

}



#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

static void addrconf_sit_config(struct net_device *dev)

{

	struct inet6_dev *idev;
@@ -2617,7 +2617,7 @@ static void addrconf_sit_config(struct net_device *dev) 
}

#endif



#if defined(CONFIG_NET_IPGRE) || defined(CONFIG_NET_IPGRE_MODULE)

#if IS_ENABLED(CONFIG_NET_IPGRE)

static void addrconf_gre_config(struct net_device *dev)

{

	struct inet6_dev *idev;
@@ -2747,12 +2747,12 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, 
		}



		switch (dev->type) {

#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

#if IS_ENABLED(CONFIG_IPV6_SIT)

		case ARPHRD_SIT:

			addrconf_sit_config(dev);

			break;

#endif

#if defined(CONFIG_NET_IPGRE) || defined(CONFIG_NET_IPGRE_MODULE)

#if IS_ENABLED(CONFIG_NET_IPGRE)

		case ARPHRD_IPGRE:

			addrconf_gre_config(dev);

			break;
@@ -3340,7 +3340,7 @@ void if6_proc_exit(void) 
}

#endif	/* CONFIG_PROC_FS */



#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

/* Check if address is a home address configured on any interface. */

int ipv6_chk_home_addr(struct net *net, const struct in6_addr *addr)

{

net/ipv6/ah6.c

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define IPV6HDR_BASELEN 8



struct tmp_ext {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		struct in6_addr saddr;

#endif

		struct in6_addr daddr;
@@ -152,7 +152,7 @@ bad: 
	return false;

}



#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

/**

 *	ipv6_rearrange_destopt - rearrange IPv6 destination options header

 *	@iph: IPv6 header
@@ -320,7 +320,7 @@ static void ah6_output_done(struct crypto_async_request *base, int err) 
	memcpy(top_iph, iph_base, IPV6HDR_BASELEN);



	if (extlen) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		memcpy(&top_iph->saddr, iph_ext, extlen);

#else

		memcpy(&top_iph->daddr, iph_ext, extlen);
@@ -385,7 +385,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) 
	memcpy(iph_base, top_iph, IPV6HDR_BASELEN);



	if (extlen) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		memcpy(iph_ext, &top_iph->saddr, extlen);

#else

		memcpy(iph_ext, &top_iph->daddr, extlen);
@@ -434,7 +434,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) 
	memcpy(top_iph, iph_base, IPV6HDR_BASELEN);



	if (extlen) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		memcpy(&top_iph->saddr, iph_ext, extlen);

#else

		memcpy(&top_iph->daddr, iph_ext, extlen);

net/ipv6/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ int datagram_send_ctl(struct net *net, struct sock *sk, 
			rthdr = (struct ipv6_rt_hdr *)CMSG_DATA(cmsg);



			switch (rthdr->type) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

			case IPV6_SRCRT_TYPE_2:

				if (rthdr->hdrlen != 2 ||

				    rthdr->segments_left != 1) {

net/ipv6/exthdrs.c

+9 −9
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <net/ndisc.h>

#include <net/ip6_route.h>

#include <net/addrconf.h>

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

#include <net/xfrm.h>

#endif
@@ -224,7 +224,7 @@ bad: 
  Destination options header.

 *****************************/



#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

static bool ipv6_dest_hao(struct sk_buff *skb, int optoff)

{

	struct ipv6_destopt_hao *hao;
@@ -288,7 +288,7 @@ static bool ipv6_dest_hao(struct sk_buff *skb, int optoff) 
#endif



static const struct tlvtype_proc tlvprocdestopt_lst[] = {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

	{

		.type	= IPV6_TLV_HAO,

		.func	= ipv6_dest_hao,
@@ -300,7 +300,7 @@ static const struct tlvtype_proc tlvprocdestopt_lst[] = { 
static int ipv6_destopt_rcv(struct sk_buff *skb)

{

	struct inet6_skb_parm *opt = IP6CB(skb);

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

	__u16 dstbuf;

#endif

	struct dst_entry *dst = skb_dst(skb);
@@ -315,14 +315,14 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) 
	}



	opt->lastopt = opt->dst1 = skb_network_header_len(skb);

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

	dstbuf = opt->dst1;

#endif



	if (ip6_parse_tlv(tlvprocdestopt_lst, skb)) {

		skb->transport_header += (skb_transport_header(skb)[1] + 1) << 3;

		opt = IP6CB(skb);

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		opt->nhoff = dstbuf;

#else

		opt->nhoff = opt->dst1;
@@ -378,7 +378,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
looped_back:

	if (hdr->segments_left == 0) {

		switch (hdr->type) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

		case IPV6_SRCRT_TYPE_2:

			/* Silently discard type 2 header unless it was

			 * processed by own
@@ -404,7 +404,7 @@ looped_back: 
	}



	switch (hdr->type) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

	case IPV6_SRCRT_TYPE_2:

		if (accept_source_route < 0)

			goto unknown_rh;
@@ -461,7 +461,7 @@ looped_back: 
	addr += i - 1;



	switch (hdr->type) {

#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

	case IPV6_SRCRT_TYPE_2:

		if (xfrm6_input_addr(skb, (xfrm_address_t *)addr,

				     (xfrm_address_t *)&ipv6_hdr(skb)->saddr,

net/ipv6/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st 
	return 0;

}



#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

#if IS_ENABLED(CONFIG_IPV6_MIP6)

static void mip6_addr_swap(struct sk_buff *skb)

{

	struct ipv6hdr *iph = ipv6_hdr(skb);