From afd825a73f281cd66959b87895a643c4d8a17bc8 Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Sat, 26 Jan 2013 22:37:15 +0100
Subject: Fix holdcount/holdcnt parameter confusion

---
 etc/inc/interfaces.inc                   | 2 +-
 usr/local/www/interfaces_bridge_edit.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e306722..6b2cb42 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -547,7 +547,7 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) {
 			mwexec("/sbin/ifconfig {$bridgeif} hellotime " . escapeshellarg($bridge['hellotime']));
 		if (!empty($bridge['priority']))
 			mwexec("/sbin/ifconfig {$bridgeif} priority " . escapeshellarg($bridge['priority']));
-		if (!empty($bridge['holdcount']))
+		if (!empty($bridge['holdcnt']))
 			mwexec("/sbin/ifconfig {$bridgeif} holdcnt " . escapeshellarg($bridge['holdcnt']));
 		if (!empty($bridge['ifpriority'])) {
 			$pconfig = explode(",", $bridge['ifpriority']);
diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php
index c777d0b..baeebe4 100644
--- a/usr/local/www/interfaces_bridge_edit.php
+++ b/usr/local/www/interfaces_bridge_edit.php
@@ -73,7 +73,7 @@ if (isset($id) && $a_bridges[$id]) {
 	$pconfig['hellotime'] = $a_bridges[$id]['hellotime'];
 	$pconfig['priority'] = $a_bridges[$id]['priority'];
 	$pconfig['proto'] = $a_bridges[$id]['proto'];
-	$pconfig['holdcount'] = $a_bridges[$id]['holdcount'];
+	$pconfig['holdcnt'] = $a_bridges[$id]['holdcnt'];
 	if (!empty($a_bridges[$id]['ifpriority'])) {
 		$pconfig['ifpriority'] = explode(",", $a_bridges[$id]['ifpriority']);
 		$ifpriority = array();
@@ -178,7 +178,7 @@ if ($_POST) {
 		$bridge['hellotime'] = $_POST['hellotime'];
 		$bridge['priority'] = $_POST['priority'];
 		$bridge['proto'] = $_POST['proto'];
-		$bridge['holdcount'] = $_POST['holdcount'];
+		$bridge['holdcnt'] = $_POST['holdcnt'];
 		$i = 0;
 		$ifpriority = "";
 		$ifpathcost = "";
-- 
cgit v1.1