From 5540759e049386ff09cd2e2a89f04f93f7ab2686 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 23 Nov 2015 07:35:01 -0200
Subject: Optimize upgrade_128_to_129()

---
 src/etc/inc/upgrade_config.inc | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/etc')

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index a09d5d8..147dc4e 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4109,17 +4109,15 @@ function upgrade_128_to_129() {
 	global $config;
 
 	/* net.inet.ip.fastforwarding does not exist in 2.3. */
-	if (isset($config['sysctl']) && is_array($config['sysctl']) &&
-	    isset($config['sysctl']['item']) && is_array($config['sysctl']['item'])) {
-		$i = 0;
-		$tmp['item'] = array();
-		foreach ($config['sysctl']['item'] as $sysctl) {
-			if ($sysctl['tunable'] === "net.inet.ip.fastforwarding")
-				continue;
-			$tmp['item'][$i++] = $sysctl;
+	if (!isset($config['sysctl']['item']) ||
+	    !is_array($config['sysctl']['item'])) {
+		return;
+	}
+
+	foreach ($config['sysctl']['item'] as $idx => $sysctl) {
+		if ($sysctl['tunable'] == "net.inet.ip.fastforwarding") {
+			unset($config['sysctl']['item'][$idx]);
 		}
-		$config['sysctl'] = $tmp;
-		unset($tmp);
 	}
 }
 
-- 
cgit v1.1