From 9af087de91a2612e27023a4856a186215e350d9d Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Tue, 16 Feb 2016 19:52:50 -0600 Subject: Revert this because of issues in Ticket #5888, will fix #4312 differently. Revert "interface_bridge_add_member is inadequate for adding a bridge member that may have not existed at the time of bridge interface's creation. interface_bridge_configure on the interface's bridge ensures all settings (private, etc.) are applied. Ticket #4312" This reverts commit 617daf5e38cefcad2d2f0ac4308f034131be31b7. --- src/etc/rc.newwanip | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 880e64a..5bc6a61 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -150,13 +150,7 @@ if (!empty($grouptmp)) { unset($bridgetmp); $bridgetmp = link_interface_to_bridge($interface); if (!empty($bridgetmp)) { - if (is_array($config['bridges']['bridged']) && count($config['bridges']['bridged'])) { - foreach ($config['bridges']['bridged'] as $bridge) { - if ($bridge['bridgeif'] == $bridgetmp) { - interface_bridge_configure($bridge); - } - } - } + interface_bridge_add_member($bridgetmp, $interface_real); } // Do not process while booting -- cgit v1.1