Yank bridge upgrade function as it appears to be a duplicate. I should have checked before making one. Oh well.

1 files changed, 1 insertions, 25 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 40e56d6..fdb3af1 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -585,31 +585,7 @@ function upgrade_036_to_037() {
 
 function upgrade_037_to_038() {
 	global $config;
-
-	/* This should only be valid when upgrading bridges from a 1.2 config */
-	$a_bridges = array();
-	$counter = 0;
-	foreach($config['interfaces'] as $name => & $interface ) {
-		if($interface['bridge'] <> "") {
-			$bridge = array();
-			$bridge['members'] = "{$name},{$interface['bridge']}";
-			$bridge['descr'] = "Upgraded from 1.2";
-			$bridge['maxaddr'] = "";
-			$bridge['timeout'] = "";
-			$bridge['maxage'] = "";
-			$bridge['fwdelay'] = "";
-			$bridge['hellotime'] = "";
-			$bridge['priority'] = "";
-			$bridge['proto'] = "rstp";
-			$bridge['holdcount'] = "";
-			$bridge['ifpriority'] = "";
-			$bridge['ifpathcost'] = "";
-			$bridge['bridgeif'] = "bridge{$counter}";
-			$a_bridges[$counter] = $bridge;
-			$counter++;
-		}
-	}
-	$config['bridges'] = $a_bridges;
+	/* Insert upgrade code here */
 }