fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: trivial: fix indentation and whitespaces

Browse source
This commit is contained in:
Beniamino Galvani 2016-02-24 09:28:17 +01:00
parent ff527652c7
commit aae6f07fe5
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5496,9 +5496,9 @@ check_and_add_ipv6ll_addr (NMDevice *self)
if (s_ip6 && nm_setting_ip6_config_get_addr_gen_mode (s_ip6) == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY) { if (s_ip6 && nm_setting_ip6_config_get_addr_gen_mode (s_ip6) == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY) {
if (!nm_utils_ipv6_addr_set_stable_privacy (&lladdr, if (!nm_utils_ipv6_addr_set_stable_privacy (&lladdr,
nm_device_get_iface (self), nm_device_get_iface (self),
nm_connection_get_uuid (connection), nm_connection_get_uuid (connection),
priv->linklocal6_dad_counter++, priv->linklocal6_dad_counter++,
&error)) { &error)) {
_LOGW (LOGD_IP6, "linklocal6: failed to generate an address: %s", error->message); _LOGW (LOGD_IP6, "linklocal6: failed to generate an address: %s", error->message);
g_clear_error (&error); g_clear_error (&error);
linklocal6_failed (self); linklocal6_failed (self);
@ -6854,12 +6854,12 @@ activate_stage5_ip6_config_commit (NMDevice *self)
* then ensure dispatcher scripts get the DHCP lease information. * then ensure dispatcher scripts get the DHCP lease information.
*/ */
nm_dispatcher_call (DISPATCHER_ACTION_DHCP6_CHANGE, nm_dispatcher_call (DISPATCHER_ACTION_DHCP6_CHANGE,
nm_device_get_settings_connection (self), nm_device_get_settings_connection (self),
nm_device_get_applied_connection (self), nm_device_get_applied_connection (self),
self, self,
NULL, NULL,
NULL, NULL,
NULL); NULL);
} else { } else {
/* still waiting for first dhcp6 lease. */ /* still waiting for first dhcp6 lease. */
return; return;
@ -8960,7 +8960,7 @@ device_ipx_changed (NMPlatform *platform,
if ( priv->state > NM_DEVICE_STATE_DISCONNECTED if ( priv->state > NM_DEVICE_STATE_DISCONNECTED
&& priv->state < NM_DEVICE_STATE_DEACTIVATING && priv->state < NM_DEVICE_STATE_DEACTIVATING
&& ( (change_type == NM_PLATFORM_SIGNAL_CHANGED && addr->flags & IFA_F_DADFAILED) && ( (change_type == NM_PLATFORM_SIGNAL_CHANGED && addr->flags & IFA_F_DADFAILED)
|| (change_type == NM_PLATFORM_SIGNAL_REMOVED && addr->flags & IFA_F_TENTATIVE))) { || (change_type == NM_PLATFORM_SIGNAL_REMOVED && addr->flags & IFA_F_TENTATIVE))) {
priv->dad6_failed_addrs = g_slist_append (priv->dad6_failed_addrs, priv->dad6_failed_addrs = g_slist_append (priv->dad6_failed_addrs,
g_memdup (addr, sizeof (NMPlatformIP6Address))); g_memdup (addr, sizeof (NMPlatformIP6Address)));