summaryrefslogtreecommitdiff
path: root/scripts/VyattaQosMatch.pm
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-02-14 10:44:50 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-02-14 10:44:50 -0800
commit33e9fbd53200bcb39b19fe9258679e9c27b67c2f (patch)
treed138ce9ae6a6d4d93361a7dc506f4d89dabdcaae /scripts/VyattaQosMatch.pm
parent13dfe609dfddf211b39d92fa372e0f583cd07355 (diff)
downloadvyatta-cfg-qos-33e9fbd53200bcb39b19fe9258679e9c27b67c2f.tar.gz
vyatta-cfg-qos-33e9fbd53200bcb39b19fe9258679e9c27b67c2f.zip
detect match conflicts during commit
Matching on 'ip' uses the u32 tc filter and other match types 'interface', 'vif' use the basic tc filter. Since kernel doesn't allow mixing filter types in the same classifier, need to catch and report the problem rather than failing in the actual commands.
Diffstat (limited to 'scripts/VyattaQosMatch.pm')
-rw-r--r--scripts/VyattaQosMatch.pm4
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/VyattaQosMatch.pm b/scripts/VyattaQosMatch.pm
index 9904274..334b7c1 100644
--- a/scripts/VyattaQosMatch.pm
+++ b/scripts/VyattaQosMatch.pm
@@ -30,10 +30,6 @@ sub _define {
if ($config->exists("ip")) {
my %ip;
- if (defined $self->{_dev} || defined $self->{_vif}) {
- die "Match on both ip field and device not supported\n";
- }
-
$ip{dsfield} = VyattaQosUtil::getDsfield( $config->returnValue("ip dscp"));
$ip{protocol} = VyattaQosUtil::getProtocol($config->returnValue("ip protocol"));
$ip{src} = $config->returnValue("ip source address");