From 79adcb964fcd09114cedecf7b856ac8fcab3323c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 3 May 2009 09:03:00 -0700
Subject: [PATCH] Cosmetic improvements in tcclasses processing

---
 Shorewall/Perl/Shorewall/Tc.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index 175b58db3..b3b70039e 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -612,10 +612,10 @@ sub validate_tc_class( $$$$$$ ) {
 		$occurs = numeric_value($val);
 		$tcref->{src} = 1 if $3 eq 's';
 
-		fatal_error q(The 'occurs' option is only valid for IPv4) if $family == F_IPV6;
-		fatal_error "Invalid 'occurs' ($val)" unless defined $occurs && $occurs > 1 && $occurs <= 256;
-		fatal_error "Invalid 'occurs' ($val)" if $occurs > ( $config{WIDE_TC_MARKS} ? 8191 : 255 );
-		fatal_error q(Duplicate 'occurs') if $tcref->{occurs} > 1;
+		fatal_error q(The 'occurs' option is only valid for IPv4)        if $family == F_IPV6;
+		fatal_error "Invalid 'occurs' ($val)"                            unless defined $occurs && $occurs > 1 && $occurs <= 256;
+		fatal_error "Invalid 'occurs' ($val)"                            if $occurs > ( $config{WIDE_TC_MARKS} ? 8191 : 255 );
+		fatal_error q(Duplicate 'occurs')                                if $tcref->{occurs} > 1;
 		fatal_error q(The 'occurs' option is only valid with 'classify') unless $devref->{classify};
 		fatal_error q(The 'occurs' option is not valid with 'default')   if $devref->{default} == $classnumber;
 		fatal_error q(The 'occurs' option is not valid with 'tos')       if @{$tcref->{tos}};
@@ -639,9 +639,10 @@ sub validate_tc_class( $$$$$$ ) {
 					       rate     => $tcref->{rate} ,
 					       ceiling  => $tcref->{ceiling} ,
 					       priority => $tcref->{priority} ,
-					       mark     => $tcref->{classify} ? 0 : ++$markval ,
+					       mark     => 0 ,
 					       flow     => $tcref->{flow} ,
 					       pfifo    => $tcref->{pfifo},
+					       occurs   => 0,
 					     };
 	push @tcclasses, "$device:$classnumber";
     };