Commit 5f0ddaa6 authored by Lubomir Rintel's avatar Lubomir Rintel 🥕
Browse files

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

This reverts commit bb0a31e6.

This was pushed by accident.
parent fccb5608
Pipeline #481412 passed with stages
in 54 minutes and 4 seconds
......@@ -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),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment