fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 13:38:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "nm-device: avoid starting ac6 if l3cfg is not there"

Browse source 
This reverts commit bb0a31e6eb.

This was pushed by accident.
This commit is contained in:
Lubomir Rintel 2022-01-11 14:57:48 +01:00
parent fccb5608f3
commit 5f0ddaa610
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/devices/nm-device.c
View file

@ -11256,18 +11256,6 @@ _dev_ipac6_start(NMDevice *self)
guint32 default_ra_timeout; guint32 default_ra_timeout;
NMUtilsIPv6IfaceId iid; NMUtilsIPv6IfaceId iid;
gboolean is_token; gboolean is_token;
const char *ifname;
if (!priv->l3cfg) {
_LOGD(LOGD_IP6, "addrconf6: no IP link for IPv6");
return;
}
ifname = nm_device_get_ip_iface(self);
if (!ifname) {
_LOGD(LOGD_IP6, "addrconf6: no interface name for IPv6");
return;
}
if (priv->ipac6_data.state == NM_DEVICE_IP_STATE_NONE) { if (priv->ipac6_data.state == NM_DEVICE_IP_STATE_NONE) {
if (!g_file_test("/proc/sys/net/ipv6", G_FILE_TEST_IS_DIR)) { if (!g_file_test("/proc/sys/net/ipv6", G_FILE_TEST_IS_DIR)) {
@ -11322,8 +11310,8 @@ _dev_ipac6_start(NMDevice *self)
{ {
const NMNDiscConfig config = { const NMNDiscConfig config = {
.l3cfg = priv->l3cfg, .l3cfg = nm_device_get_l3cfg(self),
.ifname = ifname, .ifname = nm_device_get_ip_iface(self),
.stable_type = stable_type, .stable_type = stable_type,
.network_id = stable_id, .network_id = stable_id,
.addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode(s_ip), .addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode(s_ip),