Author: hrs
Date: Sat Aug 17 07:14:45 2013
New Revision: 254441
URL: http://svnweb.freebsd.org/changeset/base/254441

Log:
  Return 0 in nbi->expire when la_expire == 0.  Conversion from time_uptime to
  time_second should not be performed in this case.

Modified:
  head/sys/netinet6/nd6.c

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c     Sat Aug 17 07:12:52 2013        (r254440)
+++ head/sys/netinet6/nd6.c     Sat Aug 17 07:14:45 2013        (r254441)
@@ -1508,7 +1508,11 @@ nd6_ioctl(u_long cmd, caddr_t data, stru
                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;
        }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to