Merge branch '4.5.15'

This commit is contained in:
Tom Eastep 2013-03-31 07:08:49 -07:00
commit ef5818ce7e

View File

@ -5056,7 +5056,7 @@ sub do_dscp( $ ) {
$value = $dscpmap{$dscp} unless defined $value;
fatal_error( "Invalid DSCP ($dscp)" ) unless defined $value && $value < 0x2f && ! ( $value & 1 );
fatal_error( "Invalid DSCP ($dscp)" ) unless defined $value && $value < 0x3f && ! ( $value & 1 );
"-m dscp ${invert}--dscp $value ";
}