From: Nick Alcock <nick.alcock@oracle.com>
Date: Tue, 24 Jan 2017 16:29:56 +0000 (+0000)
Subject: dtrace: handle modular IPv6
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5af111ce75ea93d40df1333b5e334b13c5f604a2;p=users%2Fjedix%2Flinux-maple.git

dtrace: handle modular IPv6

We want to build in the IPv6 code even when IPv6 is built as a module
(as it is in UEK).  Adjust the config conditionals accordingly.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Orabug: 25557554
---

diff --git a/dtrace/dtrace_dif.c b/dtrace/dtrace_dif.c
index c6c297dfbf7f4..f434df47c1e7a 100644
--- a/dtrace/dtrace_dif.c
+++ b/dtrace/dtrace_dif.c
@@ -3686,7 +3686,7 @@ next:
 					*end-- = '.';
 			}
 			ASSERT(end + 1 >= base);
-#ifdef CONFIG_IPV6
+#if IS_ENABLED(CONFIG_IPV6)
 		} else if (af == AF_INET6) {
 			in6_addr_t	ip6;
 			int		firstzero, tryzero, numzero, v6end;
@@ -3829,7 +3829,7 @@ next:
 			break;
 		}
 
-#ifdef CONFIG_IPV6
+#if IS_ENABLED(CONFIG_IPV6)
 inetout:
 #endif
 		regs[rd] = (uintptr_t)end + 1;