Resolve conflicts from vendor merge.

1 files changed, 3 insertions, 3 deletions

diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index dd99b8d..764463a 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -86,7 +86,7 @@ struct dr {				/* accumulated advertisements */
     struct interface *dr_ifp;
     naddr   dr_gate;			/* gateway */
     time_t  dr_ts;			/* when received */
-    time_t  dr_life;			/* lifetime */
+    time_t  dr_life;			/* lifetime in host byte order */
     n_long  dr_recv_pref;		/* received but biased preference */
     n_long  dr_pref;			/* preference adjusted by metric */
 } *cur_drp, drs[MAX_ADS];
@@ -567,7 +567,7 @@ static void
 parse_ad(naddr from,
 	 naddr gate,
 	 n_long pref,			/* signed and in network order */
-	 u_short life,
+	 u_short life,			/* in host byte order */
 	 struct interface *ifp)
 {
 	static struct msg_limit bad_gate;
@@ -649,7 +649,7 @@ parse_ad(naddr from,
 	new_drp->dr_ifp = ifp;
 	new_drp->dr_gate = gate;
 	new_drp->dr_ts = now.tv_sec;
-	new_drp->dr_life = ntohs(life);
+	new_drp->dr_life = life;
 	new_drp->dr_recv_pref = pref;
 	/* bias functional preference by metric of the interface */
 	new_drp->dr_pref = PREF(pref,ifp);