From 5a041915329d2e72f6f47a58d79995bcb341bd2c Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sat, 17 Aug 2013 07:14:45 +0000 Subject: [PATCH] Return 0 in nbi->expire when la_expire == 0. Conversion from time_uptime to time_second should not be performed in this case. --- sys/netinet6/nd6.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 5250f9346b4..7dcf2e10e7b 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1508,7 +1508,11 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) nbi->state = ln->ln_state; nbi->asked = ln->la_asked; nbi->isrouter = ln->ln_router; - nbi->expire = ln->la_expire + (time_second - time_uptime); + if (ln->la_expire == 0) + nbi->expire = 0; + else + nbi->expire = ln->la_expire + + (time_second - time_uptime); LLE_RUNLOCK(ln); break; }