summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-01-06 11:44:28 -0200
committerRenato Botelho <garga@FreeBSD.org>2015-01-06 11:44:55 -0200
commitd8540659972c0ddd66a9064a53eb357f2fd2c67f (patch)
tree5b2e5f03d8ee5278eecfd276745493b80ecbee08
parentb785a40bac3b2aeee993fd3302eff7e781654586 (diff)
downloadpfsense-d8540659972c0ddd66a9064a53eb357f2fd2c67f.zip
pfsense-d8540659972c0ddd66a9064a53eb357f2fd2c67f.tar.gz
Revert "FreeBSD fails to set advskew back to 0 after you set it to any other"
A patch was added to allow set advskew back to 0 This reverts commit eea2ad5d61b2cbcf2957207fb0f13769c203cb36.
-rw-r--r--etc/inc/interfaces.inc20
1 files changed, 4 insertions, 16 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 7322e44..16071ee 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1262,22 +1262,10 @@ function interfaces_carp_set_maintenancemode($carp_maintenancemode){
if (isset($config["virtualip_carp_maintenancemode"]) && $carp_maintenancemode == false) {
unset($config["virtualip_carp_maintenancemode"]);
write_config("Leave CARP maintenance mode");
- if(is_array($config['virtualip']['vip'])) {
- $viparr = &$config['virtualip']['vip'];
- foreach ($viparr as $vip) {
- switch ($vip['mode']) {
- case "carp":
- interface_vip_bring_down($vip);
- //sleep(1);
- break;
- }
- }
- }
- } else {
- if (!isset($config["virtualip_carp_maintenancemode"]) && $carp_maintenancemode == true) {
- $config["virtualip_carp_maintenancemode"] = true;
- write_config("Enter CARP maintenance mode");
- }
+ } else
+ if (!isset($config["virtualip_carp_maintenancemode"]) && $carp_maintenancemode == true) {
+ $config["virtualip_carp_maintenancemode"] = true;
+ write_config("Enter CARP maintenance mode");
}
$viparr = &$config['virtualip']['vip'];
OpenPOWER on IntegriCloud