diff options
| author | Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com> | 2017-04-27 11:22:24 +0300 |
|---|---|---|
| committer | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2017-04-28 15:01:11 +0300 |
| commit | d9bde9a5abe41f052c78ad3883bbb6062b48198a (patch) | |
| tree | d15f94baf42226c7d94b4d790269481b53b848d4 /subsys | |
| parent | d787ccb40ab43445a5abd35197230628df314b26 (diff) | |
net: ipv6: Use correct API to remove router
net_if_ipv6_router_rm() is the correct API to remove IPv6 router
from the interface as it also cancels the timer and raises a mgmt
event. The net_if_router_rm() only sets router as unused and
nothing else.
Change-Id: I55114288c9ae748520b67b206edcd4f5e420b1af
Signed-off-by: Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com>
Diffstat (limited to 'subsys')
| -rw-r--r-- | subsys/net/ip/ipv6.c | 6 | ||||
| -rw-r--r-- | subsys/net/ip/rpl.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c index 869205bb4..f17fa2bdd 100644 --- a/subsys/net/ip/ipv6.c +++ b/subsys/net/ip/ipv6.c @@ -1365,7 +1365,7 @@ static void nd_reachable_timeout(struct k_work *work) nbr, net_sprint_ipv6_addr(&data->addr), data->state); - net_if_router_rm(router); + net_if_ipv6_router_rm(router); nbr_free(nbr); } } else { @@ -2332,10 +2332,10 @@ static enum net_verdict handle_ra_input(struct net_pkt *pkt) &NET_IPV6_HDR(pkt)->src); if (router) { if (!router_lifetime) { - /*TODO: Start rs_timer on iface if no routers + /* TODO: Start rs_timer on iface if no routers * at all available on iface. */ - net_if_router_rm(router); + net_if_ipv6_router_rm(router); } else { if (nbr) { net_ipv6_nbr_data(nbr)->is_router = true; diff --git a/subsys/net/ip/rpl.c b/subsys/net/ip/rpl.c index 39f7037a1..41128e8f2 100644 --- a/subsys/net/ip/rpl.c +++ b/subsys/net/ip/rpl.c @@ -1455,7 +1455,7 @@ static void net_rpl_nullify_parent(struct net_if *iface, NET_DBG("Removing default route %s", net_sprint_ipv6_addr(addr)); - net_if_router_rm(dag->instance->default_route); + net_if_ipv6_router_rm(dag->instance->default_route); dag->instance->default_route = NULL; } @@ -1685,7 +1685,7 @@ static int net_rpl_set_default_route(struct net_if *iface, NET_DBG("Removing default route through %s", net_sprint_ipv6_addr(&instance->default_route->address. in6_addr)); - net_if_router_rm(instance->default_route); + net_if_ipv6_router_rm(instance->default_route); instance->default_route = NULL; } @@ -1706,7 +1706,7 @@ static int net_rpl_set_default_route(struct net_if *iface, net_sprint_ipv6_addr(&instance-> default_route->address. in6_addr)); - net_if_router_rm(instance->default_route); + net_if_ipv6_router_rm(instance->default_route); instance->default_route = NULL; } else { NET_DBG("Not removing default route because it is " @@ -2361,7 +2361,7 @@ static void net_rpl_move_parent(struct net_if *iface, NET_DBG("Removing default route %s", net_sprint_ipv6_addr(addr)); - net_if_router_rm(dag_src->instance->default_route); + net_if_ipv6_router_rm(dag_src->instance->default_route); dag_src->instance->default_route = NULL; } |