summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2022-03-15 17:59:21 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2022-03-16 10:43:46 +0100
commit041df05f3cad687b3aa30879687d9c1eb3de5746 (patch)
treeeca239c898e4fa512695d708e26c762b048cc307
parent2ffa6f7693586987790d87dce773af15fa08a472 (diff)
ppp: allow autoconf6 when ipv6.method is 'auto'
PPP supports IPv6 autoconfiguration. Fixes: 58287cbcc0c8 ('core: rework IP configuration in NetworkManager using layer 3 configuration')
-rw-r--r--src/core/devices/nm-device-ppp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c
index 5ff3240107..61e32348c4 100644
--- a/src/core/devices/nm-device-ppp.c
+++ b/src/core/devices/nm-device-ppp.c
@@ -222,10 +222,9 @@ get_ip_method_auto(NMDevice *device, int addr_family)
return NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
}
- /* We can do autoconf6 on an PPP link, but we should already get an IPv6
- * address from pppd. Use that instead. We however do want to generate our
- * (own) IPv6 link local address, so return "link-local". */
- return NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
+ /* We get a interface identifier via IPV6CP, used to construct a link-local
+ * address. Method auto means autoconf6 as usual.*/
+ return NM_SETTING_IP6_CONFIG_METHOD_AUTO;
}
static gboolean