net: if: Check in delete addr if delayed work needs cancelling

jukkar · andrewboie · commit 16837f954f9d · 2017-07-19T10:16:54.000-07:00
The address lifetime timer was cancelled always even if the address
timer was never installed.

Jira: ZEP-2397

Signed-off-by: Jukka Rissanen &lt;jukka.rissanen@linux.intel.com&gt;
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
@@ -668,7 +668,9 @@ bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr)
 			continue;
 		}
 
-		k_delayed_work_cancel(&iface->ipv6.unicast[i].lifetime);
+		if (!iface->ipv6.unicast[i].is_infinite) {
+			k_delayed_work_cancel(&iface->ipv6.unicast[i].lifetime);
+		}
 
 		iface->ipv6.unicast[i].is_used = false;
 

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,9 @@ bool net_if_ipv6_addr_rm(struct net_if iface, const struct in6_addr addr)`
`668`	`668`	`continue;`
`669`	`669`	`}`
`670`	`670`
`671`		`- k_delayed_work_cancel(&iface->ipv6.unicast[i].lifetime);`
	`671`	`+ if (!iface->ipv6.unicast[i].is_infinite) {`
	`672`	`+ k_delayed_work_cancel(&iface->ipv6.unicast[i].lifetime);`
	`673`	`+ }`
`672`	`674`
`673`	`675`	`iface->ipv6.unicast[i].is_used = false;`
`674`	`676`