diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
| commit | 1623ed9700dd89ee871313add2c4947c1227cc39 (patch) | |
| tree | f1809bd8552dd406bcef2cad32b982516c0262fb /etc/inc/shaper.inc | |
| parent | 4842755397c92f1c16b50b16e01b28768f8b43c1 (diff) | |
| parent | f49c41c538e718d06b44e9c2d279ba9b9580b5ff (diff) | |
| download | pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.zip pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/priv.defs.inc
Diffstat (limited to 'etc/inc/shaper.inc')
| -rw-r--r-- | etc/inc/shaper.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 67a1dae..6c4cbb2 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -382,7 +382,7 @@ class altq_root_queue { function &get_queue_list($q = null) { $qlist = array(); - $qlist[$this->GetQname()] = & $this; + //$qlist[$this->GetQname()] = & $this; if (is_array($this->queues)) { foreach ($this->queues as $queue) $queue->get_queue_list(&$qlist); |
