fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-20 17:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/mtu-reapply-rh1779162'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1779162
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/356
(cherry picked from commit ce2cceef83)
(cherry picked from commit 73a2557a6f)
This commit is contained in:
Beniamino Galvani 2019-12-11 13:54:49 +01:00
commit 269deeebf8
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/devices/nm-device-infiniband.c
View file

@ -209,6 +209,32 @@ update_connection (NMDevice *device, NMConnection *connection)
g_object_set (G_OBJECT (s_infiniband), NM_SETTING_INFINIBAND_TRANSPORT_MODE, transport_mode, NULL);
}
static gboolean
can_reapply_change (NMDevice *device,
const char *setting_name,
NMSetting *s_old,
NMSetting *s_new,
GHashTable *diffs,
GError **error)
{
NMDeviceClass *device_class;
if (nm_streq (setting_name, NM_SETTING_INFINIBAND_SETTING_NAME)) {
return nm_device_hash_check_invalid_keys (diffs,
NM_SETTING_INFINIBAND_SETTING_NAME,
error,
NM_SETTING_INFINIBAND_MTU); /* reapplied with IP config */
}
device_class = NM_DEVICE_CLASS (nm_device_infiniband_parent_class);
return device_class->can_reapply_change (device,
setting_name,
s_old,
s_new,
diffs,
error);
}
static gboolean
create_and_realize (NMDevice *device,
NMConnection *connection,
@ -361,6 +387,7 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass)
device_class->connection_type_check_compatible = NM_SETTING_INFINIBAND_SETTING_NAME;
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_INFINIBAND);
device_class->can_reapply_change = can_reapply_change;
device_class->create_and_realize = create_and_realize;
device_class->unrealize = unrealize;
device_class->get_generic_capabilities = get_generic_capabilities;

8
src/devices/nm-device.c
View file

@ -11497,6 +11497,14 @@ can_reapply_change (NMDevice *self,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME)) {
return TRUE;
} else if ( nm_streq (setting_name, NM_SETTING_WIRED_SETTING_NAME)
&& NM_IN_SET (NM_DEVICE_GET_CLASS (self)->get_configured_mtu,
nm_device_get_configured_mtu_wired_parent,
nm_device_get_configured_mtu_for_wired)) {
return nm_device_hash_check_invalid_keys (diffs,
NM_SETTING_WIRED_SETTING_NAME,
error,
NM_SETTING_WIRED_MTU);
} else {
g_set_error (error,
NM_DEVICE_ERROR,