summaryrefslogtreecommitdiffstats
path: root/src/etc/rc.newwanip
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-16 19:52:50 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-16 19:52:50 -0600
commit9af087de91a2612e27023a4856a186215e350d9d (patch)
tree5f612c9ffa373b6c161d13a19c8c05e9780068cd /src/etc/rc.newwanip
parent04d11c09f7ab9d9c3673367361e2a33441fb91a9 (diff)
downloadpfsense-9af087de91a2612e27023a4856a186215e350d9d.zip
pfsense-9af087de91a2612e27023a4856a186215e350d9d.tar.gz
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.
Diffstat (limited to 'src/etc/rc.newwanip')
-rwxr-xr-xsrc/etc/rc.newwanip8
1 files changed, 1 insertions, 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
OpenPOWER on IntegriCloud