Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jan 2015 14:18:49 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r276621 - projects/routing/sys/netinet6
Message-ID:  <201501031418.t03EInaQ070947@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: melifaro
Date: Sat Jan  3 14:18:48 2015
New Revision: 276621
URL: https://svnweb.freebsd.org/changeset/base/276621

Log:
  Since @ln is the result of LLTABLE6(ifp) lookup its originating interface
  must always be @ifp. So change ln->lle_tbl->llt_ifp to ifp.

Modified:
  projects/routing/sys/netinet6/nd6_nbr.c

Modified: projects/routing/sys/netinet6/nd6_nbr.c
==============================================================================
--- projects/routing/sys/netinet6/nd6_nbr.c	Sat Jan  3 14:09:35 2015	(r276620)
+++ projects/routing/sys/netinet6/nd6_nbr.c	Sat Jan  3 14:18:48 2015	(r276621)
@@ -719,7 +719,7 @@ nd6_na_input(struct mbuf *m, int off, in
 			ln->ln_byhint = 0;
 			if (!ND6_LLINFO_PERMANENT(ln)) {
 				nd6_llinfo_settimer_locked(ln,
-				    (long)ND_IFINFO(ln->lle_tbl->llt_ifp)->reachable * hz);
+				    (long)ND_IFINFO(ifp)->reachable * hz);
 			}
 		} else {
 			ln->ln_state = ND6_LLINFO_STALE;
@@ -831,10 +831,10 @@ nd6_na_input(struct mbuf *m, int off, in
 			 * is only called under the network software interrupt
 			 * context.  However, we keep it just for safety.
 			 */
-			dr = defrouter_lookup(in6, ln->lle_tbl->llt_ifp);
+			dr = defrouter_lookup(in6, ifp);
 			if (dr)
 				defrtrlist_del(dr);
-			else if (ND_IFINFO(ln->lle_tbl->llt_ifp)->flags &
+			else if (ND_IFINFO(ifp)->flags &
 			    ND6_IFF_ACCEPT_RTADV) {
 				/*
 				 * Even if the neighbor is not in the default



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501031418.t03EInaQ070947>