Module Name: src
Committed By: martin
Date: Sat Jun 9 14:44:33 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if_llatbl.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #862):
sys/net/if_llatbl.c: revision 1.27
It is necessary to set wall time instead of monotonic time to rmx_expire.
To generate a diff of this commit:
cvs rdiff -u -r1.18.6.3 -r1.18.6.4 src/sys/net/if_llatbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_llatbl.c
diff -u src/sys/net/if_llatbl.c:1.18.6.3 src/sys/net/if_llatbl.c:1.18.6.4
--- src/sys/net/if_llatbl.c:1.18.6.3 Tue Mar 13 13:27:10 2018
+++ src/sys/net/if_llatbl.c Sat Jun 9 14:44:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_llatbl.c,v 1.18.6.3 2018/03/13 13:27:10 martin Exp $ */
+/* $NetBSD: if_llatbl.c,v 1.18.6.4 2018/06/09 14:44:33 martin Exp $ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -112,8 +112,8 @@ lltable_dump_entry(struct lltable *llt,
/* Need to copy by myself */
rtm->rtm_index = ifp->if_index;
rtm->rtm_rmx.rmx_mtu = 0;
- rtm->rtm_rmx.rmx_expire =
- (lle->la_flags & LLE_STATIC) ? 0 : lle->la_expire;
+ rtm->rtm_rmx.rmx_expire = (lle->la_flags & LLE_STATIC) ? 0 :
+ time_mono_to_wall(lle->la_expire);
rtm->rtm_flags = RTF_UP;
rtm->rtm_flags |= RTF_HOST; /* For ndp */
/* For backward compatibility */
