diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-02-17 15:16:23 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-02-17 15:18:58 +0100 |
| commit | 04bb97d4c15c1f3d30d84284bf9edfc5996bffcf (patch) | |
| tree | 2c4d39ab030bd8713b42091d6279838465526132 | |
| parent | 3719c0fe84847dc52490832f54f1d4aaed3bace1 (diff) | |
| download | NetworkManager-04bb97d4c15c1f3d30d84284bf9edfc5996bffcf.tar.gz | |
libnm: move nm_setting_ip6_config_get_ra_timeout() to "libnm_1_22_8" symbol version
nm_setting_ip6_config_get_ra_timeout() was backported to nm-1-22 branch, and
will be released as 1.22.8. As such, on the stable branch the symbol will be
placed in a separate symbol version ("libnm_1_22_8").
To support the upgrade path from 1.22.8+ to 1.23+, we want this symbol
also present on master.
At that point, we don't need to duplicate the symbol. Just add the same linker
symbol version also to master.
| -rw-r--r-- | libnm/libnm.ver | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libnm/libnm.ver b/libnm/libnm.ver index dbe75e897e..9229a1fc79 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1658,6 +1658,11 @@ global: nm_client_get_capabilities; } libnm_1_22_0; +libnm_1_22_8 { +global: + nm_setting_ip6_config_get_ra_timeout; +} libnm_1_22_2; + libnm_1_24_0 { global: nm_client_get_instance_flags; @@ -1673,8 +1678,7 @@ global: nm_secret_agent_old_get_dbus_connection; nm_secret_agent_old_get_dbus_name_owner; nm_secret_agent_old_get_main_context; - nm_setting_ip6_config_get_ra_timeout; nm_setting_vrf_get_table; nm_setting_vrf_get_type; nm_setting_vrf_new; -} libnm_1_22_0; +} libnm_1_22_8; |