fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-19 11:18:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bridge: update bridge options with netlink instead of sysfs

Browse source 
sysfs is old so when bridge options are modified changes will
be sent to kernel via netlink message instead.
This commit is contained in:
Vojtech Bubela 2022-03-16 11:33:39 +01:00 • committed by Thomas Haller
parent e4ad8f8a9b
commit b676202816
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/devices/nm-device-bridge.c
View file

@ -832,20 +832,27 @@ _platform_lnk_bridge_init_from_setting(NMSettingBridge *s_bridge, NMPlatformLnkB
static NMActStageReturn
act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
{
NMConnection *connection;
NMSetting *s_bridge;
const Option *option;
NMConnection *connection;
NMSettingBridge *s_bridge;
NMPlatformLnkBridge props;
int r;
int ifindex = nm_device_get_ifindex(device);
connection = nm_device_get_applied_connection(device);
g_return_val_if_fail(connection, NM_ACT_STAGE_RETURN_FAILURE);
s_bridge = (NMSetting *) nm_connection_get_setting_bridge(connection);
s_bridge = nm_connection_get_setting_bridge(connection);
g_return_val_if_fail(s_bridge, NM_ACT_STAGE_RETURN_FAILURE);
for (option = master_options; option->name; option++)
commit_option(device, s_bridge, option, FALSE);
_platform_lnk_bridge_init_from_setting(s_bridge, &props);
if (!bridge_set_vlan_options(device, (NMSettingBridge *) s_bridge)) {
r = nm_platform_link_bridge_change(nm_device_get_platform(device), ifindex, &props);
if (r < 0) {
NM_SET_OUT(out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
return NM_ACT_STAGE_RETURN_FAILURE;
}
if (!bridge_set_vlan_options(device, s_bridge)) {
NM_SET_OUT(out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
return NM_ACT_STAGE_RETURN_FAILURE;
}