* [pve-devel] [PATCH pve-common 1/1] fix #7153: iproute2: consider bonds as physical bridge ports
@ 2025-12-16 9:43 Stefan Hanreich
2025-12-16 16:06 ` [pve-devel] superseded: " Stefan Hanreich
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Hanreich @ 2025-12-16 9:43 UTC (permalink / raw)
To: pve-devel
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 <s.hanreich@proxmox.com>
---
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->%*;
}
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] superseded: [PATCH pve-common 1/1] fix #7153: iproute2: consider bonds as physical bridge ports
2025-12-16 9:43 [pve-devel] [PATCH pve-common 1/1] fix #7153: iproute2: consider bonds as physical bridge ports Stefan Hanreich
@ 2025-12-16 16:06 ` Stefan Hanreich
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hanreich @ 2025-12-16 16:06 UTC (permalink / raw)
To: 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 <s.hanreich@proxmox.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-16 16:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-16 9:43 [pve-devel] [PATCH pve-common 1/1] fix #7153: iproute2: consider bonds as physical bridge ports Stefan Hanreich
2025-12-16 16:06 ` [pve-devel] superseded: " Stefan Hanreich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.