From e635e1646466d632250ac2ed9e0d3d3b86dfb4cf Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 17 Apr 2007 11:27:47 +0000
Subject: Fix bridge, vlan and bonding modules to work together, #174792.

---
 net.Linux/bridge.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'net.Linux/bridge.sh')

diff --git a/net.Linux/bridge.sh b/net.Linux/bridge.sh
index 89d5687e..a97e525a 100644
--- a/net.Linux/bridge.sh
+++ b/net.Linux/bridge.sh
@@ -56,7 +56,8 @@ bridge_pre_start() {
 		eval set -- ${ports}
 		for x in "$@" ; do
 			ebegin "${x}"
-			if ! ifconfig "${x}" promisc up && brctl addif "${IFACE}" "${x}" ; then
+			ifconfig "${x}" promisc up
+			if ! brctl addif "${IFACE}" "${x}" ; then
 				ifconfig "${x}" -promisc 2>/dev/null
 				eend 1
 				return 1
@@ -66,6 +67,9 @@ bridge_pre_start() {
 		eoutdent
 	fi
 	)
+
+	# Bring up the bridge
+	_up
 }
 
 bridge_post_stop() {
-- 
cgit v1.2.3