summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-06-01 04:50:14 +0000
committerBill Marquette <billm@pfsense.org>2005-06-01 04:50:14 +0000
commitde7d19b8c740594d2c1e865e06855f23f862e387 (patch)
tree3f01a4b03675b14a058ea68107a8b93cee11dd66 /etc
parentd11a220f6e2e4e32a74ee83c332c45e095b7273a (diff)
downloadpfsense-de7d19b8c740594d2c1e865e06855f23f862e387.zip
pfsense-de7d19b8c740594d2c1e865e06855f23f862e387.tar.gz
Make parent queues work again
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc18
1 files changed, 13 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 64639d5..1ca424f 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -284,12 +284,20 @@ function filter_setup_altq_interfaces() {
$rule_interface = "";
$q = $queue;
$rule_interface = filter_is_queue_being_used_on_interface($queue['name'], $workting_with_interface);
- if ($rule_interface == $workting_with_interface) {
- $status_is_subqueue = is_subqueue($queue['name']);
- if($queue['attachtoqueue'] <> "") $status_is_attached = 0;
- $queue_names .= " ";
- $queue_names .= $queue['name'];
+ if ($rule_interface == $workting_with_interface and !$seen[$q['name']]) {
+ if($q['attachtoqueue'] == "") {
+ $queue_names .= " ";
+ $queue_names .= $q['name'];
+ $seen[$q['name']] = 1;
+ }
+ } else {
+ if($q['parentqueue'] <> "" and !$seen[$q['name']]) {
+ $queue_names .= " ";
+ $queue_names .= $q['name'];
+ $seen[$q['name']] = 1;
+ }
}
+
}
if($queue_names <> ""){
OpenPOWER on IntegriCloud