From 49eb84b9e24946ea50de9778678e5129ae50b561 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 27 Dec 2011 13:06:37 -0800 Subject: [PATCH] Remove more helper/proto silliness Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index c1427bf08..f36e703eb 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -1451,15 +1451,7 @@ sub process_tc_priority() { fatal_error "Invalid PRIORITY ($band)" unless $val && $val <= 3; - my $rule; - - unless ( $helper eq '-' ) { - fatal_error( "A PROTO is required when a HELPER is specified" ) if $proto eq '-'; - fatal_error( "Unknown protocol" ) unless defined resolve_protocol( $proto ); - $rule = do_helper( $helper ) . "-j MARK --set-mark $band"; - } else { - $rule = ''; - } + my $rule = do_helper( $helper ) . "-j MARK --set-mark $band"; $rule .= join('', '/', in_hex( $globals{TC_MASK} ) ) if have_capability( 'EXMARK' );