about summary refs log tree commit diff
path: root/src/core/devices/nm-device-ppp.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2022-03-23 11:51:40 +0100
committerMichael Biebl <biebl@debian.org>2022-03-23 11:51:40 +0100
commit8c623dddbdebe354cb94bfc559a5371a14865317 (patch)
treeb8c48e415a98834ca1e19c8fa677ac04b9c51d4a /src/core/devices/nm-device-ppp.c
parent4f887bccf1cde84106588536584a2d54a5b4e6e5 (diff)
New upstream version 1.36.4 upstream/1.36.4
Diffstat (limited to 'src/core/devices/nm-device-ppp.c')
-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 5ff32401..61e32348 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