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

merge: branch 'bg/misc-fixes2'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2245
This commit is contained in:
Beniamino Galvani 2025-07-23 11:13:14 +02:00
commit 93ed7a2c38
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1066,7 +1066,7 @@ attach_port(NMDevice *device,
plat_vlans = setting_vlans_to_platform(vlans, &num_vlans); plat_vlans = setting_vlans_to_platform(vlans, &num_vlans);
/* Since the link was just enportd, there are no existing VLANs /* Since the link was just attached, there are no existing VLANs
* (except for the default one) and so there's no need to flush. */ * (except for the default one) and so there's no need to flush. */
if (plat_vlans if (plat_vlans

4
src/core/devices/nm-device.c
View file

@ -9029,7 +9029,7 @@ nm_device_port_notify_attach_as_port(NMDevice *self, gboolean success)
priv->is_attached = TRUE; priv->is_attached = TRUE;
_notify(priv->controller, PROP_CONTROLLER); _notify(self, PROP_CONTROLLER);
nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->controller)->ports_variant, nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->controller)->ports_variant,
g_variant_unref); g_variant_unref);
@ -9108,7 +9108,7 @@ nm_device_port_notify_release(NMDevice *self,
priv->is_attached = FALSE; priv->is_attached = FALSE;
_notify(priv->controller, PROP_CONTROLLER); _notify(self, PROP_CONTROLLER);
nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->controller)->ports_variant, g_variant_unref); nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->controller)->ports_variant, g_variant_unref);
nm_gobject_notify_together(priv->controller, PROP_PORTS, PROP_SLAVES); nm_gobject_notify_together(priv->controller, PROP_PORTS, PROP_SLAVES);

2
src/libnm-platform/nm-linux-platform.c
View file

@ -9249,7 +9249,7 @@ sriov_async_finish_err(SriovAsyncState *async_state, GError *error)
g_object_unref(async_state->platform); g_object_unref(async_state->platform);
g_object_unref(async_state->cancellable); g_object_unref(async_state->cancellable);
g_free(async_state); g_free(async_state);
g_free(error); nm_g_error_free(error);
} }
static void static void