diff --git a/src/script/traffic_separation b/src/script/traffic_separation
index 15363d943a33488bdfd969b1cf8e46aa6a362a1e..237e5ef913d6cda961cfdba062c2d3f4c5259897 100755
--- a/src/script/traffic_separation
+++ b/src/script/traffic_separation
@@ -326,7 +326,6 @@ EOF
 
 			# Handle extra network interfaces that should be part of the segregated VLAN
 			local netif_device=""
-			local tunnel_if=0
 			config_foreach find_vid_interface interface $vid
 
 			# support tagging for all map_port
@@ -395,10 +394,11 @@ EOF
 			exit 1
 		}
 
-                logger -t vlan "setup ts vid $vid"
-                _net_setup ${vid}
+		logger -t vlan "setup ts vid $vid"
+		local tunnel_if=0
+		_net_setup ${vid}
 
-		[ -x "/usr/sbin/mapcontroller" -a "$PRIMARY_VID" != "$vid" -a $tunnel_if -eq 1 ] && {
+		[ -x "/usr/sbin/mapcontroller" -a "$PRIMARY_VID" != "$vid" -a $tunnel_if -eq 0 ] && {
 			_dhcp_setup guest${vid}
 			_firewall_setup guest${vid} $vid
 		}