diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-27 17:08:17 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-27 17:09:21 +0200 |
| commit | c75fd9f7edaeaec5bc520b1e73afa83063cdc279 (patch) | |
| tree | cb044da62877cf9e3536a4d4e377cd3f20721ca8 /src/nm-policy.c | |
| parent | 68b70c827c50c51b5361c3cdd1764ff569b85d94 (diff) | |
| parent | f86436e83639986f20fb44663edcccf36c3c150c (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
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; |