diff options
| author | hrs <hrs@FreeBSD.org> | 2013-08-17 07:14:45 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-08-17 07:14:45 +0000 |
| commit | 9b92a60da0c48d685e399236d99364486c8577a5 (patch) | |
| tree | 7e1250b32488dd66ac3ced46d470472473672ac3 /sys/netinet6 | |
| parent | d635351bf100453ec236d47fe886f6816ec75d50 (diff) | |
| download | FreeBSD-src-9b92a60da0c48d685e399236d99364486c8577a5.zip FreeBSD-src-9b92a60da0c48d685e399236d99364486c8577a5.tar.gz | |
Return 0 in nbi->expire when la_expire == 0. Conversion from time_uptime to
time_second should not be performed in this case.
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/nd6.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 5250f93..7dcf2e1 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; } |
