diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:23:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:23:07 +0100 |
| commit | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (patch) | |
| tree | fcb5e39f41b8135e4b3a41b6951f21473e10fa5e /src/devices/nm-device.c | |
| parent | ee7b95167028fdbb2a4bd32aa686e27817d8dfe0 (diff) | |
| parent | b012fa6e1d808e0736c009799c62d835cbfcc1dd (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/devices/nm-device.c')
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3bbc9757..72ec29a1 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8005,7 +8005,7 @@ dhcp4_state_changed (NMDhcpClient *client, /* Ignore expiry before we even have a lease (NAK, old lease, etc) */ if (priv->ip_state_4 == NM_DEVICE_IP_STATE_CONF) break; - /* fall through */ + /* fall-through */ case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_FAIL: case NM_DHCP_STATE_TERMINATED: @@ -8812,7 +8812,7 @@ dhcp6_state_changed (NMDhcpClient *client, */ if (priv->dhcp6.mode == NM_NDISC_DHCP_LEVEL_OTHERCONF) break; - /* fall through */ + /* fall-through */ case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_FAIL: dhcp6_fail (self, state); @@ -13858,7 +13858,7 @@ device_ipx_changed (NMPlatform *platform, (gpointer) nmp_object_ref (NMP_OBJECT_UP_CAST (addr))); } - /* fall through */ + /* fall-through */ case NMP_OBJECT_TYPE_IP6_ROUTE: if (!priv->queued_ip_config_id_6) { priv->queued_ip_config_id_6 = g_idle_add (queued_ip6_config_change, self); |