holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch '4.4.23'

Browse Source
This commit is contained in:
Tom Eastep 2011-09-16 09:03:43 -07:00
commit 86847957bf
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -1456,6 +1456,8 @@ sub process_traffic_shaping() {
$device = physical_name $device;
unless ( $config{TC_ENABLED} eq 'Shared' ) {
my $dev = chain_base( $device );
emit( '',
@ -1466,8 +1468,6 @@ sub process_traffic_shaping() {
push_indent;
unless ( $config{TC_ENABLED} eq 'Shared' ) {
emit "if interface_is_up $device; then";
push_indent;
@ -1589,7 +1589,6 @@ sub process_traffic_shaping() {
emit '';
}
}
emit '';
@ -1610,6 +1609,7 @@ sub process_traffic_shaping() {
emit "}\n";
}
}
}
#
# Validate the TC configuration storing basic information in %tcdevices and %tcdevices
@ -1625,7 +1625,9 @@ sub process_tc() {
# it can call the appropriate 'setup_x_tc" function when the device is
# enabled.
\%tcdevices;
my %empty;
$config{TC_ENABLED} eq 'Shared' ? \%empty : \%tcdevices;
}
#
@ -1640,7 +1642,6 @@ sub setup_traffic_shaping() {
emit "setup_${dev}_tc";
}
}
#
@ -1756,7 +1757,7 @@ sub setup_tc() {
append_file $globals{TC_SCRIPT};
} else {
process_tcpri if $config{TC_ENABLED} eq 'Simple';
setup_traffic_shaping;
setup_traffic_shaping unless $config{TC_ENABLED} eq 'Shared';
}
if ( $config{TC_ENABLED} ) {