diff options
| author | Michael Biebl <biebl@debian.org> | 2022-03-23 11:52:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-03-23 11:52:46 +0100 |
| commit | 024ee2bf31c1c57823c8bf6588714a4ede5baed1 (patch) | |
| tree | 5fd63275acf48411b17c71c92771267359ba95d6 /src/core/devices/nm-device-ppp.c | |
| parent | 0514770b02f34ccb56b6bc52010452663c6717ed (diff) | |
| parent | 8c623dddbdebe354cb94bfc559a5371a14865317 (diff) | |
Update upstream source from tag 'upstream/1.36.4'
Update to upstream version '1.36.4' with Debian dir 64567d8bf986e0827368a9989323ba0356fe2888
Diffstat (limited to 'src/core/devices/nm-device-ppp.c')
| -rw-r--r-- | src/core/devices/nm-device-ppp.c | 7 |
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 |