From owner-svn-src-all@FreeBSD.ORG Thu Mar 25 17:06:39 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05FA2106566B; Thu, 25 Mar 2010 17:06:39 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from mail-bw0-f216.google.com (mail-bw0-f216.google.com [209.85.218.216]) by mx1.freebsd.org (Postfix) with ESMTP id 005308FC1B; Thu, 25 Mar 2010 17:06:37 +0000 (UTC) Received: by bwz8 with SMTP id 8so2265801bwz.3 for ; Thu, 25 Mar 2010 10:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-mailer; bh=/UnJ+z/goiZvbBkr+D9d1NK6k1W3LaKt0W7NiRlUlmY=; b=Ao+HiogI7PMWZkx2X92pijdNyv7W15XZ1lzVJXdAEqq9sXyCfj/otywW2ljoEvxvDi 2mlcfw5tMKDFRXvQT01IRYflrs4DKAGeAYjyijbhe2huLDYRxqZabcDcgP7/KBjeEI7V efziShWu288bHSgJ0JNziM/Rw73ZXYJFmwtN4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; b=xn9bBAmPgwR7TieaCmIVyEuUlvtBguBpDBq9c9UZ6CA5KFKuxj4ZlPKvUVlkGVG1PK HGzbSS5yFHEuryBZWqRfh58oZJguPCWUMPhmpmWQ5aGCTNhKcRO3+X0DyvKQlXYRvtvX oGVrNJiH9vgTxIu90Zt0lGyRHBy89QEscvvss= Received: by 10.204.134.70 with SMTP id i6mr1185722bkt.74.1269536796484; Thu, 25 Mar 2010 10:06:36 -0700 (PDT) Received: from [10.0.10.2] (54.81.54.77.rev.vodafone.pt [77.54.81.54]) by mx.google.com with ESMTPS id a11sm11500351bkc.21.2010.03.25.10.06.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 25 Mar 2010 10:06:35 -0700 (PDT) Sender: Rui Paulo Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: text/plain; charset=us-ascii From: Rui Paulo In-Reply-To: <201003251029.o2PAT0AW031465@svn.freebsd.org> Date: Thu, 25 Mar 2010 17:06:33 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201003251029.o2PAT0AW031465@svn.freebsd.org> To: Bjoern A. Zeeb X-Mailer: Apple Mail (2.1077) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r205637 - head/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2010 17:06:39 -0000 On 25 Mar 2010, at 10:29, Bjoern A. Zeeb wrote: > Author: bz > Date: Thu Mar 25 10:29:00 2010 > New Revision: 205637 > URL: http://svn.freebsd.org/changeset/base/205637 >=20 > Log: > We are holding a write lock here so avoid aquiring it twice calling > the "locked" version rather than the wrapper function. >=20 > MFC after: 6 days >=20 > Modified: > head/sys/netinet6/nd6.c >=20 > Modified: head/sys/netinet6/nd6.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet6/nd6.c Thu Mar 25 10:13:21 2010 = (r205636) > +++ head/sys/netinet6/nd6.c Thu Mar 25 10:29:00 2010 = (r205637) > @@ -1168,7 +1168,7 @@ nd6_nud_hint(struct rtentry *rt, struct=20 This code is probably missing a: LLE_WLOCK_ASSERT(lle); at the beginning. >=20 > ln->ln_state =3D ND6_LLINFO_REACHABLE; > if (!ND6_LLINFO_PERMANENT(ln)) { > - nd6_llinfo_settimer(ln, > + nd6_llinfo_settimer_locked(ln, > (long)ND_IFINFO(rt->rt_ifp)->reachable * hz); > } > done: -- Rui Paulo