diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2014-11-21 12:10:59 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2014-11-21 12:10:59 +0100 |
| commit | 64cda11e8175bf2fba34d52da6173d8acc6d0959 (patch) | |
| tree | 71e7d7d3e58c5ad6d3ef06058eb2bc0485791c88 | |
| parent | e5e16cfc962bcc98a06b89574309bc2ef0ed3542 (diff) | |
| download | pfsense-64cda11e8175bf2fba34d52da6173d8acc6d0959.zip pfsense-64cda11e8175bf2fba34d52da6173d8acc6d0959.tar.gz | |
Actually an interface is detstroyed here no need for this merge!
Revert "Merge e3cffd6cefc - Properly remove IPv6 carp vips as reported from https://forum.pfsense.org/index.php?topic=84392.0"
This reverts commit e5e16cfc962bcc98a06b89574309bc2ef0ed3542.
| -rw-r--r-- | etc/inc/interfaces.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 0d51000..6ece099 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1167,13 +1167,8 @@ function interface_vip_bring_down($vip) { break; case "carp": $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; - /* XXX: Is enough to delete ip address? */ - if (does_interface_exist($vipif)) { - if (is_ipaddrv6($vip['subnet'])) - mwexec("/sbin/ifconfig {$vipif} inet6 " . escapeshellarg($vip['subnet']) . " delete"); - else - pfSense_interface_deladdress($vipif, $vip['subnet']); - } + if (does_interface_exist($vipif)) + pfSense_interface_destroy($vipif); break; } } |
