From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.heiss@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id C7E3F95594
for <pve-devel@lists.proxmox.com>; Wed, 1 Mar 2023 13:55:23 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AE91519F3A
for <pve-devel@lists.proxmox.com>; Wed, 1 Mar 2023 13:54:53 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Wed, 1 Mar 2023 13:54:52 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0A69248D43
for <pve-devel@lists.proxmox.com>; Wed, 1 Mar 2023 13:54:52 +0100 (CET)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 1 Mar 2023 13:54:42 +0100
Message-Id: <20230301125444.552793-2-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230301125444.552793-1-c.heiss@proxmox.com>
References: <20230301125444.552793-1-c.heiss@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.085 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [zones.pm]
Subject: [pve-devel] [PATCH network 1/3] zones: Drop unused `firewall`
argument to {add, del}_bridge_fdb()
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 01 Mar 2023 12:55:23 -0000
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>
---
PVE/Network/SDN/Zones.pm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index f8e40b1..58f9df8 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/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.39.2