From c669255503af047b645f71f8aa37bc6dc133fefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Tue, 5 Aug 2008 16:16:55 +0000
Subject: [PATCH] Remove old way bridge knobs too on the config. Anything has
 to be done through the new bridging code.

---
 etc/inc/config.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index f2c64d6894..59041cac6a 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1666,6 +1666,12 @@ function convert_config() {
                 $pconfig['value'] = "0";
                 $config['sysctl']['item'][] = $pconfig;
 
+		unset($config['bridge']);
+
+		foreach ($config['interfaces'] as &$intf) {
+			if (isset($intf['bridge']))
+				unset($intf['bridge']);
+		}
 	}
 
 	$now = date("H:i:s");