From 8bc65a96260f52f89bf92495a9e7cfeb4a162bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Thu, 24 Mar 2016 16:10:51 +0100
Subject: [PATCH] gnrc_ipv6_netif: remove existing interfaces on INIT
---
.../ipv6/netif/gnrc_ipv6_netif.c | 49 ++++++++++---------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c b/sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c
index fc3eda826e..f4125a3579 100644
--- a/sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c
+++ b/sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c
@@ -167,14 +167,34 @@ static void _reset_addr_from_entry(gnrc_ipv6_netif_t *entry)
memset(entry->addrs, 0, sizeof(entry->addrs));
}
+static void _ipv6_netif_remove(gnrc_ipv6_netif_t *entry)
+{
+ if (entry == NULL) {
+ return;
+ }
+
+#ifdef MODULE_GNRC_NDP
+ gnrc_ndp_netif_remove(entry);
+#endif
+
+ mutex_lock(&entry->mutex);
+ xtimer_remove(&entry->rtr_sol_timer);
+#ifdef MODULE_GNRC_NDP_ROUTER
+ xtimer_remove(&entry->rtr_adv_timer);
+#endif
+ _reset_addr_from_entry(entry);
+ DEBUG("ipv6 netif: Remove IPv6 interface %" PRIkernel_pid "\n", entry->pid);
+ entry->pid = KERNEL_PID_UNDEF;
+ entry->flags = 0;
+
+ mutex_unlock(&entry->mutex);
+}
+
void gnrc_ipv6_netif_init(void)
{
for (int i = 0; i < GNRC_NETIF_NUMOF; i++) {
mutex_init(&(ipv6_ifs[i].mutex));
- mutex_lock(&(ipv6_ifs[i].mutex));
- _reset_addr_from_entry(&ipv6_ifs[i]);
- ipv6_ifs[i].pid = KERNEL_PID_UNDEF;
- mutex_unlock(&(ipv6_ifs[i].mutex));
+ _ipv6_netif_remove(&ipv6_ifs[i]);
}
}
@@ -228,26 +248,7 @@ void gnrc_ipv6_netif_add(kernel_pid_t pid)
void gnrc_ipv6_netif_remove(kernel_pid_t pid)
{
gnrc_ipv6_netif_t *entry = gnrc_ipv6_netif_get(pid);
-
- if (entry == NULL) {
- return;
- }
-
-#ifdef MODULE_GNRC_NDP
- gnrc_ndp_netif_remove(entry);
-#endif
-
- mutex_lock(&entry->mutex);
- xtimer_remove(&entry->rtr_sol_timer);
-#ifdef MODULE_GNRC_NDP_ROUTER
- xtimer_remove(&entry->rtr_adv_timer);
-#endif
- _reset_addr_from_entry(entry);
- DEBUG("ipv6 netif: Remove IPv6 interface %" PRIkernel_pid "\n", pid);
- entry->pid = KERNEL_PID_UNDEF;
- entry->flags = 0;
-
- mutex_unlock(&entry->mutex);
+ _ipv6_netif_remove(entry);
}
gnrc_ipv6_netif_t *gnrc_ipv6_netif_get(kernel_pid_t pid)
--
GitLab