diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 19:36:59 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 19:36:59 -0300 |
| commit | 5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1 (patch) | |
| tree | 0edfeb752c97b07730131bb21863fc0858b379cd /etc/inc/interfaces.inc | |
| parent | 487caee6a7cb2fa18367f513ca85c990be036a19 (diff) | |
| parent | 1cd94dc8b751ad0c10e51bdfe221b51f1dfb4c70 (diff) | |
| download | pfsense-5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1.zip pfsense-5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/captiveportal.inc
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 18dc18f..11e8321 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2313,7 +2313,7 @@ function find_dhclient_process($interface) { return $pid; } -function interface_configure($interface = "wan", $reloadall = false) { +function interface_configure($interface = "wan", $reloadall = false, $linkupevent = false) { global $config, $g; global $interface_sn_arr_cache, $interface_ip_arr_cache; @@ -2482,10 +2482,12 @@ function interface_configure($interface = "wan", $reloadall = false) { if (!empty($gif)) interface_gif_configure($gif); - unset($bridgetmp); - $bridgetmp = link_interface_to_bridge($interface); - if (!empty($bridgetmp)) - interface_bridge_add_member($bridgetmp, $realif); + if ($linkupevent == false) { + unset($bridgetmp); + $bridgetmp = link_interface_to_bridge($interface); + if (!empty($bridgetmp)) + interface_bridge_add_member($bridgetmp, $realif); + } link_interface_to_vips($interface, "update"); |
