[pve-devel] [PATCH network v2 1/1] sdn: zones: drop unused `firewall` argument to {add, del}_bridge_fdb()

Christoph Heiss c.heiss at proxmox.com
Wed Jul 5 16:38:15 CEST 2023


PVE::Network::{add,del}_bridge_fdb() do not actually have a `firewall`
parameter, so drop it. And since it wasn't used anywhere else in these
subroutines, drop it completely.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
---
Changes v1 -> v2:
  * No changes

 src/PVE/Network/SDN/Zones.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm
index 7d70e49..1e678ed 100644
--- a/src/PVE/Network/SDN/Zones.pm
+++ b/src/PVE/Network/SDN/Zones.pm
@@ -326,31 +326,31 @@ sub tap_plug {
 }

 sub add_bridge_fdb {
-    my ($iface, $macaddr, $bridge, $firewall) = @_;
+    my ($iface, $macaddr, $bridge) = @_;

     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1);
     if (!$vnet) { # fallback for classic bridge
-	PVE::Network::add_bridge_fdb($iface, $macaddr, $firewall);
+	PVE::Network::add_bridge_fdb($iface, $macaddr);
 	return;
     }

     my $plugin_config = get_plugin_config($vnet);
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    PVE::Network::add_bridge_fdb($iface, $macaddr, $firewall) if $plugin_config->{'bridge-disable-mac-learning'};
+    PVE::Network::add_bridge_fdb($iface, $macaddr) if $plugin_config->{'bridge-disable-mac-learning'};
 }

 sub del_bridge_fdb {
-    my ($iface, $macaddr, $bridge, $firewall) = @_;
+    my ($iface, $macaddr, $bridge) = @_;

     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1);
     if (!$vnet) { # fallback for classic bridge
-	PVE::Network::del_bridge_fdb($iface, $macaddr, $firewall);
+	PVE::Network::del_bridge_fdb($iface, $macaddr);
 	return;
     }

     my $plugin_config = get_plugin_config($vnet);
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
-    PVE::Network::del_bridge_fdb($iface, $macaddr, $firewall) if $plugin_config->{'bridge-disable-mac-learning'};
+    PVE::Network::del_bridge_fdb($iface, $macaddr) if $plugin_config->{'bridge-disable-mac-learning'};
 }

 1;
--
2.41.0






More information about the pve-devel mailing list