From owner-svn-src-projects@FreeBSD.ORG Sat Jan 3 14:18:49 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0215F6E; Sat, 3 Jan 2015 14:18:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A93731E25; Sat, 3 Jan 2015 14:18:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t03EInnv070948; Sat, 3 Jan 2015 14:18:49 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t03EInaQ070947; Sat, 3 Jan 2015 14:18:49 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201501031418.t03EInaQ070947@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 3 Jan 2015 14:18:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276621 - projects/routing/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jan 2015 14:18:49 -0000 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