diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2016-07-13 01:51:23 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2016-07-13 01:51:23 +0000 |
| commit | 8c61c618f41a3ae8551406b90d9dd65add863b06 (patch) | |
| tree | a27cf4815c21b545aef80b44866c769625f35899 /sys/netinet6/nd6.h | |
| parent | e71b5275044433e5fe25c49b46e5eea57d992ff5 (diff) | |
store nd6 expiries in the route, not separately in the llinfo struct.
this makes it more consistent with arp, and makes expiries visible
via route(8) get as well as ndp(8).
ok mpi@ florian@
Diffstat (limited to 'sys/netinet6/nd6.h')
| -rw-r--r-- | sys/netinet6/nd6.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 44bce18a0ca..02a7924aae6 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.h,v 1.62 2016/06/15 11:49:34 mpi Exp $ */ +/* $OpenBSD: nd6.h,v 1.63 2016/07/13 01:51:22 dlg Exp $ */ /* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */ /* @@ -144,7 +144,6 @@ struct llinfo_nd6 { TAILQ_ENTRY(llinfo_nd6) ln_list; struct rtentry *ln_rt; struct mbuf *ln_hold; /* last packet until resolved/timeout */ - time_t ln_expire; /* lifetime for NDP state transition */ long ln_asked; /* number of queries already sent for addr */ int ln_byhint; /* # of times we made it reachable by UL hint */ short ln_state; /* reachability state */ @@ -154,7 +153,7 @@ struct llinfo_nd6 { }; #define ND6_IS_LLINFO_PROBREACH(n) ((n)->ln_state > ND6_LLINFO_INCOMPLETE) -#define ND6_LLINFO_PERMANENT(n) ((n)->ln_expire == 0) +#define ND6_LLINFO_PERMANENT(n) ((n)->ln_rt->rt_expire == 0) /* node constants */ #define MAX_REACHABLE_TIME 3600000 /* msec */ |