diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-02-28 11:30:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-02-28 11:30:45 +0100 |
| commit | 90cc458d31a44c9ab07294cd34691cfb53d5bafc (patch) | |
| tree | ec0ce8bfc0c5c28906f4a44f84962aef1d61597c | |
| parent | 93b94a6151f05b567e853b570da502e49ee1c271 (diff) | |
| parent | 0decc027ba889eebc2e927f46022652c67b05eb1 (diff) | |
| download | NetworkManager-90cc458d31a44c9ab07294cd34691cfb53d5bafc.tar.gz | |
libnm: merge branch 'champtar:route-unreachable'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1549
| -rw-r--r-- | src/libnm-core-impl/nm-setting-ip4-config.c | 2 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-ip6-config.c | 2 | ||||
| -rw-r--r-- | src/libnm-platform/nmp-global-tracker.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c index 83727ea3cb..7819c2e816 100644 --- a/src/libnm-core-impl/nm-setting-ip4-config.c +++ b/src/libnm-core-impl/nm-setting-ip4-config.c @@ -1152,7 +1152,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) * </listitem> * <listitem> * <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>, - * <literal>unavailable</literal>, <literal>prohibit</literal>, <literal>throw</literal>. + * <literal>unreachable</literal>, <literal>prohibit</literal>, <literal>throw</literal>. * The default is <literal>unicast</literal>.</para> * </listitem> * <listitem> diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c index 54f0967c09..573211b23c 100644 --- a/src/libnm-core-impl/nm-setting-ip6-config.c +++ b/src/libnm-core-impl/nm-setting-ip6-config.c @@ -1138,7 +1138,7 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) * </listitem> * <listitem> * <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>, - * <literal>unavailable</literal>, <literal>prohibit</literal>, <literal>throw</literal>. + * <literal>unreachable</literal>, <literal>prohibit</literal>, <literal>throw</literal>. * The default is <literal>unicast</literal>.</para> * </listitem> * <listitem> diff --git a/src/libnm-platform/nmp-global-tracker.c b/src/libnm-platform/nmp-global-tracker.c index 122ba0ea7f..3fd31e4e14 100644 --- a/src/libnm-platform/nmp-global-tracker.c +++ b/src/libnm-platform/nmp-global-tracker.c @@ -26,7 +26,7 @@ * view. That is mainly, because such objects are themselves tied to an ifindex. * * However, for certain objects that's not the case. For example, policy routing - * rules, certain route types (blackhole, unavailable, prohibit, throw) and MPTCP + * rules, certain route types (blackhole, unreachable, prohibit, throw) and MPTCP * endpoints require a holistic view of the system. That is, because rules and * these route types have no ifindex. For MPTCP endpoints, they have an ifindex, * however we can only configure a small number of them at a time, so we need a |