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-ethernet.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-ethernet.c')
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6b80c4ed..86e50c52 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1242,7 +1242,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() preconfig down falling through"); - /* fall through */ + /* fall-through */ case DCB_WAIT_CARRIER_PRECONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() preconfig up configuring DCB"); @@ -1266,7 +1266,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() postconfig down falling through"); - /* fall through */ + /* fall-through */ case DCB_WAIT_CARRIER_POSTCONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() postconfig up starting IP"); |