Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions subsys/net/ip/net_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,11 @@ void net_if_start_rs(struct net_if *iface)
ipv6->rs_start = k_uptime_get_32();

k_mutex_lock(&lock, K_FOREVER);

/* Make sure that the RS timer is not in the list twice */
(void)sys_slist_find_and_remove(&active_rs_timers, &ipv6->rs_node);
sys_slist_append(&active_rs_timers, &ipv6->rs_node);

k_mutex_unlock(&lock);

/* FUTURE: use schedule, not reschedule. */
Expand Down Expand Up @@ -3383,6 +3387,8 @@ static void iface_ipv6_stop(struct net_if *iface)
IF_ENABLED(CONFIG_NET_IPV6_IID_STABLE, (ipv6->network_counter++));
IF_ENABLED(CONFIG_NET_IPV6_IID_STABLE, (ipv6->iid = NULL));

net_if_stop_rs(iface);

/* Remove all autoconf addresses */
ARRAY_FOR_EACH(ipv6->unicast, i) {
if (ipv6->unicast[i].is_used &&
Expand Down