From a6db9d4fda1dd7bf2b3e7a6f63a9d0e2bf12fe0a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 9 May 2018 08:07:53 +0200
Subject: [PATCH] radvd: cluster logic, less noise against stable #2394

---
 src/etc/inc/services.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index f2cbf6438..9d8988b0a 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -294,14 +294,16 @@ function services_radvd_configure($blacklist = array())
             $autotype = $config['interfaces'][$trackif]['ipaddrv6'];
         }
 
-        $subnetv6 = $autotype != 'slaac' ? '::' : '2000::';
         $mtu = legacy_interface_stats($realif)['mtu'];
         $dnslist = array();
+        $subnetv6 = '::';
         $ifcfgsnv6 = '64';
 
         $ifcfgipv6 = get_interface_ipv6($if);
 
-        if ($autotype != 'slaac' && is_ipaddrv6($ifcfgipv6)) {
+        if ($autotype == 'slaac') {
+            $subnetv6 = '2000::';
+        } elseif (is_ipaddrv6($ifcfgipv6)) {
             $ifcfgsnv6 = get_interface_subnetv6($if);
             $subnetv6 = gen_subnetv6($ifcfgipv6, $ifcfgsnv6);
         }