--- a/ciena.grammar	Wed Dec 30 15:57:22 2009 +0100
+++ b/ciena.grammar	Fri Jan 15 16:48:13 2010 +0100
@@ -1,6 +1,6 @@
 # Grammar for Ciena devices
 #
-# Copyright (c) 2009, Tomas Zeman <tzeman@volny.cz>
+# Copyright (c) 2009, 2010 Tomas Zeman <tzeman@volny.cz>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,6 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-#<autotree>
 { # perl code follows
 
 $::res = {};
@@ -154,10 +153,12 @@
 		| word value
 		{ $avl->{$item{word}} = $item{value}; }
 # Sub-port
-l_sub_port:	"sub-port" /add|create/ "sub-port" identifier avls
+l_sub_port:	"sub-port" /add|create/ "sub-port" identifier avls /(vlan-untagged-data)?/
 		{
 		$avl->{action} = $item[2];
 		consume_avl("sub-port", $item{identifier}); 
+		$::res->{'sub-port'}->{$item{identifier}}->{'vtag-stack'} = $item[6]
+			if (length $item[6] > 0);
 		}
 
 # PM