[pve-devel] [PATCH pve-network 0/1] fix bridge-disable-mac-learning

[pve-devel] [PATCH pve-network 0/1] fix bridge-disable-mac-learning

[Alexandre Derumier]

- rebase with $opts->{learning}

Alexandre Derumier (1):
  bridge-disable-mac-learning : use $opts for tap_plug

 PVE/Network/SDN/Zones.pm        | 5 +++--
 PVE/Network/SDN/Zones/Plugin.pm | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH pve-network 1/1] bridge-disable-mac-learning : use $opts for tap_plug

[Alexandre Derumier]

---
 PVE/Network/SDN/Zones.pm        | 5 +++--
 PVE/Network/SDN/Zones/Plugin.pm | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index 492defd..f8e40b1 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -309,8 +309,9 @@ sub tap_plug {
     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1);
     if (!$vnet) { # fallback for classic bridge
 	my $interfaces_config = PVE::INotify::read_file('interfaces');
-	my $disablelearning = 1 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'};
-	PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $disablelearning);
+	my $opts = {};
+	$opts->{learning} = 0 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'};
+	PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts);
 	return;
     }
 
diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm
index 1f5b5c2..2c707b3 100644
--- a/PVE/Network/SDN/Zones/Plugin.pm
+++ b/PVE/Network/SDN/Zones/Plugin.pm
@@ -227,7 +227,9 @@ sub tap_plug {
     my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$vnetid/bridge/vlan_filtering");
     die "vm vlans are not allowed on vnet $vnetid" if !$vlan_aware && ($tag || $trunks);
 
-    PVE::Network::tap_plug($iface, $vnetid, $tag, $firewall, $trunks, $rate, $plugin_config->{'bridge-disable-mac-learning'});
+    my $opts = {};
+    $opts->{learning} = 0 if $plugin_config->{'bridge-disable-mac-learning'};
+    PVE::Network::tap_plug($iface, $vnetid, $tag, $firewall, $trunks, $rate, $opts);
 }
 
 #helper
-- 
2.30.2