svn commit: r206110 - stable/8/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Fri Apr  2 17:52:50 2010
New Revision: 206110
URL: http://svn.freebsd.org/changeset/base/206110

Log:
  MFC r205637:
  
    We are holding a write lock here so avoid aquiring it twice calling
    the "locked" version rather than the wrapper function.

Modified:
  stable/8/sys/netinet6/nd6.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet6/nd6.c
==============================================================================
--- stable/8/sys/netinet6/nd6.c	Fri Apr  2 17:50:52 2010	(r206109)
+++ stable/8/sys/netinet6/nd6.c	Fri Apr  2 17:52:50 2010	(r206110)
@@ -1167,7 +1167,7 @@ nd6_nud_hint(struct rtentry *rt, struct 
 
  	ln->ln_state = 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: