From 7413cbfdabc2c7d23092b29049a7b604f401c767 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Mon, 30 Aug 2010 19:56:14 +0000
Subject: Ticket #846. Do not try to add an interface to the bridge during an
 event of LINK_UP.

---
 etc/rc.linkup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'etc/rc.linkup')

diff --git a/etc/rc.linkup b/etc/rc.linkup
index 02eedc4..997228f 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -56,7 +56,8 @@ function handle_argument_group($iface, $argument2) {
 			$riface = get_real_interface($iface);
 			exec("/usr/sbin/arp -d -i {$riface} -a");
 			log_error("HOTPLUG: Configuring interface {$iface}");
-			interface_configure($iface);
+			// Do not try to readd to bridge otherwise em(4) has problems
+			interface_configure($iface, false, true); 
 			break;
 		case "up":
 			log_error("DEVD Ethernet attached event for {$iface}");
-- 
cgit v1.1