From 5f0ddaa610c45a1dfa309e8fae5e2081ca9656d5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Jan 2022 14:57:48 +0100 Subject: [PATCH] Revert "nm-device: avoid starting ac6 if l3cfg is not there" This reverts commit bb0a31e6eb70da90b0d415f499834c5820522baf. This was pushed by accident. --- src/core/devices/nm-device.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index c1253f1edd..8b74946807 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -11256,18 +11256,6 @@ _dev_ipac6_start(NMDevice *self) guint32 default_ra_timeout; NMUtilsIPv6IfaceId iid; 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 (!g_file_test("/proc/sys/net/ipv6", G_FILE_TEST_IS_DIR)) { @@ -11322,8 +11310,8 @@ _dev_ipac6_start(NMDevice *self) { const NMNDiscConfig config = { - .l3cfg = priv->l3cfg, - .ifname = ifname, + .l3cfg = nm_device_get_l3cfg(self), + .ifname = nm_device_get_ip_iface(self), .stable_type = stable_type, .network_id = stable_id, .addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode(s_ip),