From 746689591917b507537843c6704528f7a3c73850 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 4 Apr 2011 09:14:46 -0700
Subject: [PATCH] Revert tcpri change

---
 Shorewall/Perl/Shorewall/Tc.pm | 3 +--
 Shorewall/releasenotes.txt     | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index 7ca14717a..d0a78dcfc 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -1330,7 +1330,7 @@ sub setup_simple_traffic_shaping() {
 	first_entry
 	    sub {
 		progress_message2 "$doing $fn1...";
-		warning_message "There are entries in $fn1 but $fn was empty" unless $interfaces;
+		warning_message "There are entries in $fn1 but $fn was empty" unless $interfaces || $family == F_IPV6;
 	    };
 
 	process_tc_priority while read_a_line;
@@ -1339,7 +1339,6 @@ sub setup_simple_traffic_shaping() {
 
 	if ( $ipp2p ) {
 	    insert_rule1 $mangle_table->{tcpost} , 0 , '-m mark --mark 0/'   . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --restore-mark --ctmask ' . in_hex( $globals{TC_MASK} );
-	    insert_rule1 $mangle_table->{tcpost} , 1 , '-m mark ! --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j RETURN';
 	    add_rule     $mangle_table->{tcpost} ,     '-m mark ! --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --save-mark --ctmask '    . in_hex( $globals{TC_MASK} );
 	}
     }
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index e8d3a18c5..186b93ada 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -124,13 +124,6 @@ Beta 1
 6)  The contents of the Netfilter mangle table are now included in the
     output from 'shorewall show tc'.
 
-7)  When simple traffic shaping is configured, the postrouting marking
-    chain 'tcpost' is now exited early if the connection was previously
-    marked.
-
-    Note: tcpost is usually deleted by optimization level 4 and its
-    rules appear in the POSTROUTING chain.
-
 ----------------------------------------------------------------------------
              I V.  R E L E A S E  4 . 4  H I G H L I G H T S
 ----------------------------------------------------------------------------