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

Commit d90f9b35 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB: Use IS_ENABLED(CONFIG_IPV6) 



Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 6887a413

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr) 
		dev_put(dev);

		break;



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	case AF_INET6:

		rcu_read_lock();

		for_each_netdev_rcu(&init_net, dev) {
@@ -243,7 +243,7 @@ static int addr4_resolve(struct sockaddr_in *src_in, 
	return ret;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static int addr6_resolve(struct sockaddr_in6 *src_in,

			 struct sockaddr_in6 *dst_in,

			 struct rdma_dev_addr *addr)

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -2278,7 +2278,7 @@ static int cma_get_port(struct rdma_id_private *id_priv) 
static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,

			       struct sockaddr *addr)

{

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	struct sockaddr_in6 *sin6;



	if (addr->sa_family != AF_INET6)

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+3 −4
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev) 
	return 0;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \

defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_VLAN_8021Q)



static int ocrdma_inet6addr_event(struct notifier_block *notifier,

				  unsigned long event, void *ptr)
@@ -549,7 +548,7 @@ static struct ocrdma_driver ocrdma_drv = { 


static void ocrdma_unregister_inet6addr_notifier(void)

{

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	unregister_inet6addr_notifier(&ocrdma_inet6addr_notifier);

#endif

}
@@ -558,7 +557,7 @@ static int __init ocrdma_init_module(void) 
{

	int status;



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	status = register_inet6addr_notifier(&ocrdma_inet6addr_notifier);

	if (status)

		return status;

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work) 


		if (skb->protocol == htons(ETH_P_IP))

			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

		else if (skb->protocol == htons(ETH_P_IPV6))

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);

#endif