fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 20:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bridge: move initialization of NMPlatformLnkBridge from NMSettingBridge to separate function

Browse source 
Move initialization of NMSettingBridge from NMPlatformLnkBridge to separate
function.

This is needed because this initialization will be used in more than one
function.
This commit is contained in:
Vojtech Bubela 2022-02-28 10:57:05 +01:00 • committed by Thomas Haller
parent 976e2eeb93
commit 9b4bf36bf1
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 39 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -791,6 +791,44 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge)
return TRUE;
}
static void
_platform_lnk_bridge_init_from_setting(NMSettingBridge *s_bridge, NMPlatformLnkBridge *props)
{
*props = (NMPlatformLnkBridge){
.forward_delay = _DEFAULT_IF_ZERO(nm_setting_bridge_get_forward_delay(s_bridge) * 100u,
NM_BRIDGE_FORWARD_DELAY_DEF_SYS),
.hello_time = _DEFAULT_IF_ZERO(nm_setting_bridge_get_hello_time(s_bridge) * 100u,
NM_BRIDGE_HELLO_TIME_DEF_SYS),
.max_age = _DEFAULT_IF_ZERO(nm_setting_bridge_get_max_age(s_bridge) * 100u,
NM_BRIDGE_MAX_AGE_DEF_SYS),
.ageing_time = nm_setting_bridge_get_ageing_time(s_bridge) * 100u,
.stp_state = nm_setting_bridge_get_stp(s_bridge),
.priority = nm_setting_bridge_get_priority(s_bridge),
.vlan_protocol = to_sysfs_vlan_protocol_sys(nm_setting_bridge_get_vlan_protocol(s_bridge)),
.vlan_stats_enabled = nm_setting_bridge_get_vlan_stats_enabled(s_bridge),
.group_fwd_mask = nm_setting_bridge_get_group_forward_mask(s_bridge),
.mcast_snooping = nm_setting_bridge_get_multicast_snooping(s_bridge),
.mcast_router =
to_sysfs_multicast_router_sys(nm_setting_bridge_get_multicast_router(s_bridge)),
.mcast_query_use_ifaddr = nm_setting_bridge_get_multicast_query_use_ifaddr(s_bridge),
.mcast_querier = nm_setting_bridge_get_multicast_querier(s_bridge),
.mcast_hash_max = nm_setting_bridge_get_multicast_hash_max(s_bridge),
.mcast_last_member_count = nm_setting_bridge_get_multicast_last_member_count(s_bridge),
.mcast_startup_query_count = nm_setting_bridge_get_multicast_startup_query_count(s_bridge),
.mcast_last_member_interval =
nm_setting_bridge_get_multicast_last_member_interval(s_bridge),
.mcast_membership_interval = nm_setting_bridge_get_multicast_membership_interval(s_bridge),
.mcast_querier_interval = nm_setting_bridge_get_multicast_querier_interval(s_bridge),
.mcast_query_interval = nm_setting_bridge_get_multicast_query_interval(s_bridge),
.mcast_query_response_interval =
nm_setting_bridge_get_multicast_query_response_interval(s_bridge),
.mcast_startup_query_interval =
nm_setting_bridge_get_multicast_startup_query_interval(s_bridge),
};
to_sysfs_group_address_sys(nm_setting_bridge_get_group_address(s_bridge), &props->group_addr);
}
static NMActStageReturn
act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
{
@ -1054,39 +1092,7 @@ create_and_realize(NMDevice *device,
}
}
props = (NMPlatformLnkBridge){
.forward_delay = _DEFAULT_IF_ZERO(nm_setting_bridge_get_forward_delay(s_bridge) * 100u,
NM_BRIDGE_FORWARD_DELAY_DEF_SYS),
.hello_time = _DEFAULT_IF_ZERO(nm_setting_bridge_get_hello_time(s_bridge) * 100u,
NM_BRIDGE_HELLO_TIME_DEF_SYS),
.max_age = _DEFAULT_IF_ZERO(nm_setting_bridge_get_max_age(s_bridge) * 100u,
NM_BRIDGE_MAX_AGE_DEF_SYS),
.ageing_time = nm_setting_bridge_get_ageing_time(s_bridge) * 100u,
.stp_state = nm_setting_bridge_get_stp(s_bridge),
.priority = nm_setting_bridge_get_priority(s_bridge),
.vlan_protocol = to_sysfs_vlan_protocol_sys(nm_setting_bridge_get_vlan_protocol(s_bridge)),
.vlan_stats_enabled = nm_setting_bridge_get_vlan_stats_enabled(s_bridge),
.group_fwd_mask = nm_setting_bridge_get_group_forward_mask(s_bridge),
.mcast_snooping = nm_setting_bridge_get_multicast_snooping(s_bridge),
.mcast_router =
to_sysfs_multicast_router_sys(nm_setting_bridge_get_multicast_router(s_bridge)),
.mcast_query_use_ifaddr = nm_setting_bridge_get_multicast_query_use_ifaddr(s_bridge),
.mcast_querier = nm_setting_bridge_get_multicast_querier(s_bridge),
.mcast_hash_max = nm_setting_bridge_get_multicast_hash_max(s_bridge),
.mcast_last_member_count = nm_setting_bridge_get_multicast_last_member_count(s_bridge),
.mcast_startup_query_count = nm_setting_bridge_get_multicast_startup_query_count(s_bridge),
.mcast_last_member_interval =
nm_setting_bridge_get_multicast_last_member_interval(s_bridge),
.mcast_membership_interval = nm_setting_bridge_get_multicast_membership_interval(s_bridge),
.mcast_querier_interval = nm_setting_bridge_get_multicast_querier_interval(s_bridge),
.mcast_query_interval = nm_setting_bridge_get_multicast_query_interval(s_bridge),
.mcast_query_response_interval =
nm_setting_bridge_get_multicast_query_response_interval(s_bridge),
.mcast_startup_query_interval =
nm_setting_bridge_get_multicast_startup_query_interval(s_bridge),
};
to_sysfs_group_address_sys(nm_setting_bridge_get_group_address(s_bridge), &props.group_addr);
_platform_lnk_bridge_init_from_setting(s_bridge, &props);
/* If mtu != 0, we set the MTU of the new bridge at creation time. However, kernel will still
* automatically adjust the MTU of the bridge based on the minimum of the slave's MTU.