shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-26 08:55:40 +03:00
Code

network: optionally bring up interface before joining bridge

Browse Source 
Closes #34247.
This commit is contained in:
Yu Watanabe 2024-09-16 02:36:13 +09:00
parent caab80415e
commit 52ec7dd995
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rules.d/81-net-bridge.rules Normal file
View File

@ -0,0 +1,13 @@
# do not edit this file, it will be overwritten on update
ACTION=="remove", GOTO="net_bridge_end"
SUBSYSTEM!="net", GOTO="net_bridge_end"
# Some devices require the port to be up before joining the bridge.
# In such cases, set ID_NET_BRING_UP_BEFORE_JOINING_BRIDGE to "1".
# Texas Instruments Ethernet device with switchdev mode:
# https://software-dl.ti.com/jacinto7/esd/processor-sdk-linux-j721s2/latest/exports/docs/linux/Foundational_Components/Kernel/Kernel_Drivers/Network/CPSWng-Native-Ethernet.html#switch-mode
ENV{ID_NET_DRIVER}=="am65-cpsw-nuss", ENV{ID_NET_BRING_UP_BEFORE_JOINING_BRIDGE}="1"
LABEL="net_bridge_end"

1
rules.d/meson.build
View File

@ -29,6 +29,7 @@ rules = [
'75-probe_mtd.rules',
'78-sound-card.rules',
'80-net-setup-link.rules',
'81-net-bridge.rules',
'81-net-dhcp.rules',
'90-iocost.rules',
)],

20
src/network/networkd-setlink.c
View File

@ -6,6 +6,7 @@
#include <linux/if_bridge.h>
#include <linux/ipv6.h>
#include "device-private.h"
#include "missing_network.h"
#include "netif-util.h"
#include "netlink-util.h"
@ -585,6 +586,25 @@ static int link_is_ready_to_set_link(Link *link, Request *req) {
return r;
}
if (link->network->bridge && !FLAGS_SET(link->flags, IFF_UP) && link->dev) {
/* Some devices require the port to be up before joining the bridge.
*
* E.g. Texas Instruments SoC Ethernet running in switch mode:
* https://software-dl.ti.com/jacinto7/esd/processor-sdk-linux-j721s2/latest/exports/docs/linux/Foundational_Components/Kernel/Kernel_Drivers/Network/CPSWng-Native-Ethernet.html#switch-mode
* > Port’s netdev devices have to be in UP state before joining the bridge. This is
* > to avoid overwriting of bridge configuration as CPSW switch driver completely
* > reloads its configuration when first port changes its state to UP. */
r = device_get_property_bool(link->dev, "ID_NET_BRING_UP_BEFORE_JOINING_BRIDGE");
if (r < 0 && r != -ENOENT)
log_link_warning_errno(link, r, "Failed to get or parse ID_NET_BRING_UP_BEFORE_JOINING_BRIDGE property, ignoring: %m");
else if (r > 0) {
r = link_up_now(link);
if (r < 0)
return r;
}
}
req->userdata = UINT32_TO_PTR(m);
break;
}