From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 4 Jun 2018 00:07:45 +0200 Subject: New upstream version 1.11.4 --- src/platform/nm-platform-utils.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/platform/nm-platform-utils.c') diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c index b664e8a9..114bf4b3 100644 --- a/src/platform/nm-platform-utils.c +++ b/src/platform/nm-platform-utils.c @@ -589,6 +589,8 @@ nmp_utils_ip_config_source_coerce_to_rtprot (NMIPConfigSource source) switch (source) { case NM_IP_CONFIG_SOURCE_KERNEL: return RTPROT_KERNEL; + case NM_IP_CONFIG_SOURCE_IP6LL: + return RTPROT_KERNEL; case NM_IP_CONFIG_SOURCE_DHCP: return RTPROT_DHCP; case NM_IP_CONFIG_SOURCE_NDISC: @@ -656,6 +658,7 @@ nmp_utils_ip_config_source_to_string (NMIPConfigSource source, char *buf, gsize case NM_IP_CONFIG_SOURCE_KERNEL: s = "kernel"; break; case NM_IP_CONFIG_SOURCE_SHARED: s = "shared"; break; case NM_IP_CONFIG_SOURCE_IP4LL: s = "ipv4ll"; break; + case NM_IP_CONFIG_SOURCE_IP6LL: s = "ipv6ll"; break; case NM_IP_CONFIG_SOURCE_PPP: s = "ppp"; break; case NM_IP_CONFIG_SOURCE_WWAN: s = "wwan"; break; case NM_IP_CONFIG_SOURCE_VPN: s = "vpn"; break; -- cgit 1.3.0-6-gf8a5 From 069cb5c3a525ebcc19cc2927964258acaca87b13 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 17 Jun 2018 14:54:10 +0200 Subject: New upstream version 1.11.90 --- src/platform/nm-platform-utils.c | 62 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) (limited to 'src/platform/nm-platform-utils.c') diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c index 114bf4b3..0d224443 100644 --- a/src/platform/nm-platform-utils.c +++ b/src/platform/nm-platform-utils.c @@ -384,6 +384,40 @@ nmp_utils_ethtool_get_link_settings (int ifindex, return TRUE; } + +#define ADVERTISED_INVALID 0 +#define BASET_ALL_MODES ( ADVERTISED_10baseT_Half \ + | ADVERTISED_10baseT_Full \ + | ADVERTISED_100baseT_Half \ + | ADVERTISED_100baseT_Full \ + | ADVERTISED_1000baseT_Half \ + | ADVERTISED_1000baseT_Full \ + | ADVERTISED_10000baseT_Full ) + +static inline guint32 +get_baset_mode (guint32 speed, NMPlatformLinkDuplexType duplex) +{ + if (duplex == NM_PLATFORM_LINK_DUPLEX_UNKNOWN) + return ADVERTISED_INVALID; + + if (duplex == NM_PLATFORM_LINK_DUPLEX_HALF) { + switch (speed) { + case 10: return ADVERTISED_10baseT_Half; + case 100: return ADVERTISED_100baseT_Half; + case 1000: return ADVERTISED_1000baseT_Half; + default: return ADVERTISED_INVALID; + } + } else { + switch (speed) { + case 10: return ADVERTISED_10baseT_Full; + case 100: return ADVERTISED_100baseT_Full; + case 1000: return ADVERTISED_1000baseT_Full; + case 10000: return ADVERTISED_10000baseT_Full; + default: return ADVERTISED_INVALID; + } + } +} + gboolean nmp_utils_ethtool_set_link_settings (int ifindex, gboolean autoneg, @@ -395,6 +429,8 @@ nmp_utils_ethtool_set_link_settings (int ifindex, }; g_return_val_if_fail (ifindex > 0, FALSE); + g_return_val_if_fail ( (speed && duplex != NM_PLATFORM_LINK_DUPLEX_UNKNOWN) + || (!speed && duplex == NM_PLATFORM_LINK_DUPLEX_UNKNOWN), FALSE); /* retrieve first current settings */ if (!ethtool_get (ifindex, &edata)) @@ -404,7 +440,31 @@ nmp_utils_ethtool_set_link_settings (int ifindex, edata.cmd = ETHTOOL_SSET; if (autoneg) { edata.autoneg = AUTONEG_ENABLE; - edata.advertising = edata.supported; + if (!speed) + edata.advertising = edata.supported; + else { + guint32 mode; + + mode = get_baset_mode (speed, duplex); + + if (!mode) { + nm_log_trace (LOGD_PLATFORM, + "ethtool[%d]: %uBASE-T %s duplex mode cannot be advertised", + ifindex, + speed, + nm_platform_link_duplex_type_to_string (duplex)); + return FALSE; + } + if (!(edata.supported & mode)) { + nm_log_trace (LOGD_PLATFORM, + "ethtool[%d]: device does not support %uBASE-T %s duplex mode", + ifindex, + speed, + nm_platform_link_duplex_type_to_string (duplex)); + return FALSE; + } + edata.advertising = (edata.supported & ~BASET_ALL_MODES) | mode; + } } else { edata.autoneg = AUTONEG_DISABLE; -- cgit 1.3.0-6-gf8a5