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 c6c297dfbf7f4ded21203ffc6d43f98cea81bf0a..f434df47c1e7a7322a5d51db74b51df52e221a23 100644 (file)
--- 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;