CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Tue Sep  1 08:46:27 UTC 2015

Modified Files:
        src/sys/netinet6: nd6.c

Log Message:
Cleanup nd6_nud_hint

The deleted rtfree was never called.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet6/nd6.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.170 src/sys/netinet6/nd6.c:1.171
--- src/sys/netinet6/nd6.c:1.170	Mon Aug 31 03:26:53 2015
+++ src/sys/netinet6/nd6.c	Tue Sep  1 08:46:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.170 2015/08/31 03:26:53 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.c,v 1.171 2015/09/01 08:46:27 ozaki-r Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.170 2015/08/31 03:26:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.171 2015/09/01 08:46:27 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1167,10 +1167,9 @@ nd6_free(struct rtentry *rt, int gc)
  * XXX cost-effective methods?
  */
 void
-nd6_nud_hint(struct rtentry *rt0)
+nd6_nud_hint(struct rtentry *rt)
 {
 	struct llinfo_nd6 *ln;
-	struct rtentry *rt = rt0;
 
 	if (rt == NULL)
 		return;
@@ -1180,12 +1179,12 @@ nd6_nud_hint(struct rtentry *rt0)
 	    !rt->rt_llinfo || !rt->rt_gateway ||
 	    rt->rt_gateway->sa_family != AF_LINK) {
 		/* This is not a host route. */
-		goto exit;
+		return;
 	}
 
 	ln = (struct llinfo_nd6 *)rt->rt_llinfo;
 	if (ln->ln_state < ND6_LLINFO_REACHABLE)
-		goto exit;
+		return;
 
 	/*
 	 * if we get upper-layer reachability confirmation many times,
@@ -1193,16 +1192,14 @@ nd6_nud_hint(struct rtentry *rt0)
 	 */
 	ln->ln_byhint++;
 	if (ln->ln_byhint > nd6_maxnudhint)
-		goto exit;
+		return;
 
 	ln->ln_state = ND6_LLINFO_REACHABLE;
 	if (!ND6_LLINFO_PERMANENT(ln)) {
 		nd6_llinfo_settimer(ln,
 		    (long)ND_IFINFO(rt->rt_ifp)->reachable * hz);
 	}
-exit:
-	if (rt != rt0)
-		rtfree(rt);
+
 	return;
 }