More tidying up of Mangle Actions

- Delete an inadvertently-added blank line
- Move $convert declaration back to the Tc module
- Add comments in the Tc module about key moved declarations

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall/Perl/Shorewall/Chains.pm

@@ -3027,7 +3027,6 @@ sub initialize_chain_table($) {
 	for my $chain ( qw(PREROUTING INPUT OUTPUT FORWARD POSTROUTING ) ) {
 	    new_builtin_chain 'mangle', $chain, 'ACCEPT';
 	}
-
     }
 
     my $chainref;

Shorewall/Perl/Shorewall/Rules.pm

@@ -260,8 +260,6 @@ our %tcdevices;
 our %tcclasses;
 our %classids;
 
-our $convert;
-
 our $mangle;
 
 our $sticky;
@@ -4946,4 +4944,5 @@ sub process_mangle_rule( $ ) {
 	process_mangle_rule1( $chainref, $originalmark, $source, $dest, $proto, $ports, $sports, $user, $testval, $length, $tos , $connbytes, $helper, $headers, $probability , $dscp , $state, $time );
     }
 }
+
 1;

Shorewall/Perl/Shorewall/Tc.pm

@@ -84,6 +84,9 @@ our %flow_keys = ( 'src'            => 1,
 #
 our @tcdevices;
 our @devnums;
+#
+# %tcdevices moved to the Rules module in 5.0.7
+#
 our $devnum;
 our $ipp2p;
 
@@ -107,9 +110,13 @@ our $ipp2p;
 #                                     }
 #             }
 our @tcclasses;
-
+#
+# %tcclasses and %classids moved to the Rules module in 5.0.7
+#
 our $family;
 
+our $convert;
+
 #
 # Rather than initializing globals in an INIT block or during declaration,
 # we initialize them in a function. This is done for two reasons:
@@ -129,7 +136,6 @@ sub initialize( $ ) {
     $ipp2p     = 0;
 }
 
- 
 sub rate_to_kbit( $ ) {
     my $rate = $_[0];