diff options
| author | Michael Biebl <biebl@debian.org> | 2017-02-16 00:01:12 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-02-16 00:01:12 +0100 |
| commit | ecb2fdd2c959a2a53fa9ce961203d363f86b389b (patch) | |
| tree | 681cfa4e900d09fa9af89cac3cec4e34568b11c0 /src/devices/nm-device-ethernet.c | |
| parent | 01f15cee9ceeb145ca7d328b255fbce2b4eacce5 (diff) | |
| parent | a222e56e103f949b148a6942e385ccca2c26d9f3 (diff) | |
Merge tag 'upstream/1.6.2'
Upstream version 1.6.2
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 327e54a8..5df16df0 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1171,7 +1171,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() preconfig down falling through"); - /* carrier never went down? fall through */ + /* fall through */ case DCB_WAIT_CARRIER_PRECONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() preconfig up configuring DCB"); @@ -1195,7 +1195,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() postconfig down falling through"); - /* carrier never went down? fall through */ + /* fall through */ case DCB_WAIT_CARRIER_POSTCONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() postconfig up starting IP"); |