From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 31A8B1FF15E for ; Mon, 22 Dec 2025 21:24:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D763A1AF1B; Mon, 22 Dec 2025 21:25:14 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Mon, 22 Dec 2025 21:24:18 +0100 Message-ID: <20251222202431.1142212-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1766435063432 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [188.114.96.3] Subject: [pve-devel] [PATCH common/stable-8] fix #7181: backport: consider bonds as physical bridge ports X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This is a backport of: 8516622 ("fix #7153: iproute2: consider bonds as physical bridge ports") the needed changes were moving the code into PVE/Network.pm (PVE/IPRoute2.pm got created in PVE 9.0) and adapting the method declaration to pre v5.36 behavior (not signatured subs). minimally tested with a reproducer based on the report in #7181. Signed-off-by: Stoiko Ivanov --- src/PVE/Network.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index 9a8449a..7961eb0 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -970,7 +970,8 @@ sub get_physical_bridge_ports { $ip_links = ip_link_details() if !defined($ip_links); return grep { - ip_link_is_physical($ip_links->{$_}) && $ip_links->{$_}->{master} eq $bridge + (ip_link_is_physical($ip_links->{$_}) || ip_link_is_bond($ip_links->{$_})) + && defined($ip_links->{$_}->{master}) && $ip_links->{$_}->{master} eq $bridge } keys $ip_links->%*; } @@ -999,6 +1000,15 @@ sub ip_link_is_physical { && (!defined($ip_link->{linkinfo}) || !defined($ip_link->{linkinfo}->{info_kind})); } +sub ip_link_is_bond { + my ($ip_link) = @_; + return + $ip_link->{link_type} eq 'ether' + && defined($ip_link->{linkinfo}) + && defined($ip_link->{linkinfo}->{info_kind}) + && $ip_link->{linkinfo}->{info_kind} eq 'bond'; +} + sub altname_mapping { my ($ip_links) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel