fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 14:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix handling route-metric for nm_ip4_config_merge()

Browse source 
Fixes: bc75cd53a8
(cherry picked from commit 47cc91bef6)
This commit is contained in:
Thomas Haller 2015-07-22 14:17:08 +02:00
parent 9588c4633a
commit 3308114211
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-ip4-config.c
View file

@ -570,7 +570,7 @@ nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src)
if (dst_priv->route_metric == -1)
dst_priv->route_metric = src_priv->route_metric;
else
else if (src_priv->route_metric != -1)
dst_priv->route_metric = MIN (dst_priv->route_metric, src_priv->route_metric);
/* domains */

2
src/nm-ip6-config.c
View file

@ -647,7 +647,7 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src)
if (dst_priv->route_metric == -1)
dst_priv->route_metric = src_priv->route_metric;
else
else if (src_priv->route_metric != -1)
dst_priv->route_metric = MIN (dst_priv->route_metric, src_priv->route_metric);
/* domains */