public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH network v2 1/1] sdn: zones: drop unused `firewall` argument to {add, del}_bridge_fdb()
Date: Wed,  5 Jul 2023 16:38:15 +0200	[thread overview]
Message-ID: <20230705143818.1359775-2-c.heiss@proxmox.com> (raw)
In-Reply-To: <20230705143818.1359775-1-c.heiss@proxmox.com>

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@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





  reply	other threads:[~2023-07-05 14:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-05 14:38 [pve-devel] [PATCH network/container/qemu-server v2 0/3] " Christoph Heiss
2023-07-05 14:38 ` Christoph Heiss [this message]
2023-07-05 14:38 ` [pve-devel] [PATCH container v2 2/2] net: drop unused `firewall` argument to add_bridge_fdb() Christoph Heiss
2023-07-05 14:38 ` [pve-devel] [PATCH qemu-server v2 3/3] net: drop unused `firewall` argument to {add, del}_bridge_fdb() Christoph Heiss
2024-07-22 16:16 ` [pve-devel] [PATCH network/container/qemu-server v2 0/3] " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230705143818.1359775-2-c.heiss@proxmox.com \
    --to=c.heiss@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal