svn commit: r288658 - head/sys/netinet6

[Alexander V. Chernikov]

Author: melifaro
Date: Sun Oct  4 08:33:16 2015
New Revision: 288658
URL: https://svnweb.freebsd.org/changeset/base/288658

Log:
  Eliminate nd6_llinfo_settimer(). All consumers were converted to
    use nd6_llinfo_settimer_locked() in r216022.
  Make nd6_llinfo_settimer_locked() static: last external consumer was
  converted in r288124.

Modified:
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6.h

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Sun Oct  4 08:21:15 2015	(r288657)
+++ head/sys/netinet6/nd6.c	Sun Oct  4 08:33:16 2015	(r288658)
@@ -134,6 +134,7 @@ static int regen_tmpaddr(struct in6_ifad
 static void nd6_free(struct llentry *, int);
 static void nd6_free_redirect(const struct llentry *);
 static void nd6_llinfo_timer(void *);
+static void nd6_llinfo_settimer_locked(struct llentry *, long);
 static void clear_llinfo_pqueue(struct llentry *);
 static void nd6_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
 static int nd6_resolve_slow(struct ifnet *, struct mbuf *,
@@ -483,7 +484,7 @@ skip1:
 /*
  * ND6 timer routine to handle ND6 entries
  */
-void
+static void
 nd6_llinfo_settimer_locked(struct llentry *ln, long tick)
 {
 	int canceled;
@@ -579,16 +580,6 @@ nd6_llinfo_setstate(struct llentry *lle,
 	lle->ln_state = newstate;
 }
 
-
-void
-nd6_llinfo_settimer(struct llentry *ln, long tick)
-{
-
-	LLE_WLOCK(ln);
-	nd6_llinfo_settimer_locked(ln, tick);
-	LLE_WUNLOCK(ln);
-}
-
 /*
  * Timer-dependent part of nd state machine.
  *

Modified: head/sys/netinet6/nd6.h
==============================================================================
--- head/sys/netinet6/nd6.h	Sun Oct  4 08:21:15 2015	(r288657)
+++ head/sys/netinet6/nd6.h	Sun Oct  4 08:33:16 2015	(r288658)
@@ -408,8 +408,6 @@ struct llentry *nd6_lookup(const struct 
 struct llentry *nd6_alloc(const struct in6_addr *, int, struct ifnet *);
 void nd6_setmtu(struct ifnet *);
 void nd6_llinfo_setstate(struct llentry *lle, int newstate);
-void nd6_llinfo_settimer(struct llentry *, long);
-void nd6_llinfo_settimer_locked(struct llentry *, long);
 void nd6_timer(void *);
 void nd6_purge(struct ifnet *);
 int nd6_resolve(struct ifnet *, int, struct mbuf *,