summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-03-23 11:59:55 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2016-03-23 11:59:55 -0500
commit21b1367fee0d21071f7849d2684f8c0127fc3901 (patch)
treef3ff36e578cad55be27b9ea9dfa46693c8699bf4 /src/etc
parent1558a4bebb9e4afd64ab0fcd9440f515ae25db9e (diff)
downloadpfsense-21b1367fee0d21071f7849d2684f8c0127fc3901.zip
pfsense-21b1367fee0d21071f7849d2684f8c0127fc3901.tar.gz
Pass the correct variable to get_interface_bandwidth(). Fixes the boot crash reported by JimP.
Spotted by: Jorge Oliveira Ticket #5721
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/shaper.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index df240ca..8560b57 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -215,7 +215,7 @@ function get_obj_bandwidth($obj) {
switch ($match[1]) {
case '%':
- $objbw = ($bw / 100) * get_interface_bandwidth($object);
+ $objbw = ($bw / 100) * get_interface_bandwidth($obj);
break;
default:
$objbw = $bw * get_bandwidthtype_scale($scale);
@@ -251,10 +251,6 @@ function get_hfsc_bandwidth($object, $bw) {
function get_interface_bandwidth($object) {
global $altq_list_queues;
- if (!$object) {
- return 0;
- }
-
$int = $object->GetInterface();
$altq =& $altq_list_queues[$int];
if ($altq) {
OpenPOWER on IntegriCloud