summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core/addr.c
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-07-05 22:39:34 -0700
committerRoland Dreier <roland@purestorage.com>2012-07-08 18:04:32 -0700
commitd90f9b3591b3b5fa86178e318008fc1c531a84dc (patch)
tree4d822267a4b756900a50b215c42807e8b70f4716 /drivers/infiniband/core/addr.c
parent6887a4131da3adaab011613776d865f4bcfb5678 (diff)
downloadblackbird-op-linux-d90f9b3591b3b5fa86178e318008fc1c531a84dc.tar.gz
blackbird-op-linux-d90f9b3591b3b5fa86178e318008fc1c531a84dc.zip
IB: Use IS_ENABLED(CONFIG_IPV6)
Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/core/addr.c')
-rw-r--r--drivers/infiniband/core/addr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 6ef660c1332f..28058ae33d38 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -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 @@ out:
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)
OpenPOWER on IntegriCloud