diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-09 18:51:11 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-20 14:32:38 +0200 |
| commit | 810dc260ef5697560e49fd92a2f6cb166d7babf4 (patch) | |
| tree | 9c0177a563757a7ae6d74a8e239af98ee130b97d /src/tests/test-ip4-config.c | |
| parent | 33866e4030bce9bec081474c33e37854efb58ba7 (diff) | |
| download | NetworkManager-810dc260ef5697560e49fd92a2f6cb166d7babf4.tar.gz | |
core: track origin of MTU
Only override MTU if it came from a source of higher priority or is of equal
priority but of lower value.
Diffstat (limited to 'src/tests/test-ip4-config.c')
| -rw-r--r-- | src/tests/test-ip4-config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index ca01d5f02e..68de1e3ea6 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -139,7 +139,7 @@ test_subtract (void) nm_ip4_config_add_wins (dst, expected_wins); nm_ip4_config_set_mss (dst, expected_mss); - nm_ip4_config_set_mtu (dst, expected_mtu); + nm_ip4_config_set_mtu (dst, expected_mtu, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_subtract (dst, src); @@ -310,9 +310,9 @@ test_merge_subtract_mss_mtu (void) /* add MSS, MTU to configs to test them */ nm_ip4_config_set_mss (cfg2, expected_mss2); - nm_ip4_config_set_mtu (cfg2, expected_mtu2); + nm_ip4_config_set_mtu (cfg2, expected_mtu2, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_set_mss (cfg3, expected_mss3); - nm_ip4_config_set_mtu (cfg3, expected_mtu3); + nm_ip4_config_set_mtu (cfg3, expected_mtu3, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_merge (cfg1, cfg2); /* ensure MSS and MTU are in cfg1 */ |