diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-27 17:03:33 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-27 17:03:33 +0200 |
| commit | b92fc658301eb82b80167a31179c9b839f151b18 (patch) | |
| tree | 26e2203952eef4ee60e58c6904755e5508150a26 /src/nm-policy.c | |
| parent | 486e0bef719d78ee55d2166b0bfb4fa684c09854 (diff) | |
| parent | 136d191f1c96dbae1489fed7c2565f5e1b1f8d40 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/nm-policy.c')
| -rw-r--r-- | src/nm-policy.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index 2a9f6c05..62ead242 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -442,14 +442,12 @@ get_best_active_connection (NMPolicy *self, * * In this case, is it really the best device? Why do we even need the best * device?? */ - metric = nm_utils_ip_route_metric_normalize (addr_family, - NMP_OBJECT_CAST_IP_ROUTE (r)->metric); + metric = NMP_OBJECT_CAST_IP_ROUTE (r)->metric; is_fully_activated = TRUE; } else if ( !fully_activated && (connection = nm_device_get_applied_connection (device)) && nm_utils_connection_has_default_route (connection, addr_family, NULL)) { - metric = nm_utils_ip_route_metric_normalize (addr_family, - nm_device_get_route_metric (device, addr_family)); + metric = nm_device_get_route_metric (device, addr_family); is_fully_activated = FALSE; } else continue; |