diff options
| author | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
| commit | 069cb5c3a525ebcc19cc2927964258acaca87b13 (patch) | |
| tree | 66ac6b21a44d630c0fc281c0df327239d491226a /libnm-core/nm-connection.c | |
| parent | 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 (diff) | |
New upstream version 1.11.90 upstream/1.11.90
Diffstat (limited to 'libnm-core/nm-connection.c')
| -rw-r--r-- | libnm-core/nm-connection.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 790e98b8..0c4d7ce1 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -791,13 +791,11 @@ _normalize_ethernet_link_neg (NMConnection *self) NMSettingWired *s_wired = nm_connection_get_setting_wired (self); if (s_wired) { - gboolean autoneg = nm_setting_wired_get_auto_negotiate (s_wired); guint32 speed = nm_setting_wired_get_speed (s_wired); const char *duplex = nm_setting_wired_get_duplex (s_wired); - if ( (autoneg && (speed || duplex)) - || (!autoneg && ( (speed && !duplex) - || (!speed && duplex)))) { + if ( (speed && !duplex) + || (!speed && duplex)) { speed = 0; duplex = NULL; g_object_set (s_wired, |