From c559eac1c3b839cfe99b7ec680481e7cb53da445 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 1 Jul 2020 10:16:38 +0200 Subject: [PATCH] remove more variable declarations with post-ifs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit usage of $mtu is always guarded by an if itself anyway, so all of these are redundant post-ifs and can be removed. Signed-off-by: Fabian Grünbichler --- PVE/Network/SDN/Zones/QinQPlugin.pm | 4 ++-- PVE/Network/SDN/Zones/VlanPlugin.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm index c0b2402..c8dd0ab 100644 --- a/PVE/Network/SDN/Zones/QinQPlugin.pm +++ b/PVE/Network/SDN/Zones/QinQPlugin.pm @@ -55,7 +55,7 @@ sub generate_sdn_config { die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge"; my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); - my $is_ovs = 1 if !-d "/sys/class/net/$bridge/brif"; + my $is_ovs = !-d "/sys/class/net/$bridge/brif"; my @iface_config = (); my $vnet_bridge_ports = ""; @@ -177,7 +177,7 @@ sub status { } my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); - my $is_ovs = 1 if !-d "/sys/class/net/$bridge/brif"; + my $is_ovs = !-d "/sys/class/net/$bridge/brif"; my $tag = $vnet->{tag}; my $vnet_uplink = "ln_".$vnetid; diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm index 8e99fc4..dedb32c 100644 --- a/PVE/Network/SDN/Zones/VlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VlanPlugin.pm @@ -44,11 +44,11 @@ sub generate_sdn_config { die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge"; my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); - my $is_ovs = 1 if !-d "/sys/class/net/$bridge/brif"; + my $is_ovs = !-d "/sys/class/net/$bridge/brif"; my $tag = $vnet->{tag}; my $alias = $vnet->{alias}; - my $mtu = $plugin_config->{mtu} if $plugin_config->{mtu}; + my $mtu = $plugin_config->{mtu}; my $vnet_uplink = "ln_".$vnetid; my $vnet_uplinkpeer = "pr_".$vnetid; @@ -142,7 +142,7 @@ sub status { } my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); - my $is_ovs = 1 if !-d "/sys/class/net/$bridge/brif"; + my $is_ovs = !-d "/sys/class/net/$bridge/brif"; my $tag = $vnet->{tag}; my $vnet_uplink = "ln_".$vnetid; -- 2.39.2