diff options
| author | Michael Biebl <biebl@debian.org> | 2020-07-13 22:06:54 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-07-13 22:06:54 +0200 |
| commit | c954a7079d01d0e5fad9c8ad99d8891d9e6f5bed (patch) | |
| tree | 3f24a6356fc531498ec6b091a67230eaf725145d /src/nm-manager.c | |
| parent | 36f77b6d9a724e4bc8e219b15fe446cd3a5e0099 (diff) | |
| parent | 136d191f1c96dbae1489fed7c2565f5e1b1f8d40 (diff) | |
Update upstream source from tag 'upstream/1.26.0'
Update to upstream version '1.26.0' with Debian dir ac612e9c69962647563dd4d6aa7499aacaf8aa3c
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index ae78b7c9..92112532 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3044,10 +3044,9 @@ _get_best_connectivity (NMManager *self, int addr_family) gint64 metric; r = nm_device_get_best_default_route (dev, addr_family); - if (r) { - metric = nm_utils_ip_route_metric_normalize (addr_family, - NMP_OBJECT_CAST_IP_ROUTE (r)->metric); - } else { + if (r) + metric = NMP_OBJECT_CAST_IP_ROUTE (r)->metric; + else { /* if all devices have no default-route, we still include the best * of all connectivity state of all the devices. */ metric = G_MAXINT64; |