From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7B7471FF17C for ; Tue, 16 Dec 2025 17:05:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C0371510B; Tue, 16 Dec 2025 17:06:27 +0100 (CET) Message-ID: <11ae7393-5827-48ca-a79d-30444ad1422c@proxmox.com> Date: Tue, 16 Dec 2025 17:06:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: pve-devel@lists.proxmox.com References: <20251216094329.36089-1-s.hanreich@proxmox.com> Content-Language: en-US From: Stefan Hanreich In-Reply-To: <20251216094329.36089-1-s.hanreich@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.726 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] superseded: [PATCH pve-common 1/1] fix #7153: iproute2: 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" https://lore.proxmox.com/pve-devel/20251216160513.360391-1-s.hanreich@proxmox.com/T/#u On 12/16/25 10:43 AM, Stefan Hanreich wrote: > The new check did not consider bonds, since ip_link_is_physical only > returns true for physical interfaces - but not bonds. Add a new > function to check for bonds explicitly and use it when checking for > bridge ports in activate_bridge_vlan. > > Fixes: 057f62f73 > Signed-off-by: Stefan Hanreich > --- > src/PVE/IPRoute2.pm | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/IPRoute2.pm b/src/PVE/IPRoute2.pm > index 5208d93..69c8758 100644 > --- a/src/PVE/IPRoute2.pm > +++ b/src/PVE/IPRoute2.pm > @@ -32,6 +32,14 @@ sub ip_link_is_physical($ip_link) { > && (!defined($ip_link->{linkinfo}) || !defined($ip_link->{linkinfo}->{info_kind})); > } > > +sub ip_link_is_bond($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 ip_link_is_bridge($ip_link) { > return > defined($ip_link->{linkinfo}) > @@ -67,7 +75,8 @@ sub get_physical_bridge_ports($bridge, $ip_links = undef) { > } > > 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->{$_})) > + && $ip_links->{$_}->{master} eq $bridge > } keys $ip_links->%*; > } > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel