svn commit: r259983 - in stable: 10/sys/netinet6 9/sys/netinet6

[Dimitry Andric]

Author: dim
Date: Sat Dec 28 01:19:48 2013
New Revision: 259983
URL: http://svnweb.freebsd.org/changeset/base/259983

Log:
  MFC r259840:
  
  In sys/netinet6/in6_mcast.c, in6m_is_ifp_detached() is only used
  whenever KTR is defined, so put it between #ifdef KTR guards.  This
  avoids a warning about a unused function if KTR is not enabled.

Modified:
  stable/10/sys/netinet6/in6_mcast.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/netinet6/in6_mcast.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/10/sys/netinet6/in6_mcast.c
==============================================================================
--- stable/10/sys/netinet6/in6_mcast.c	Sat Dec 28 01:15:34 2013	(r259982)
+++ stable/10/sys/netinet6/in6_mcast.c	Sat Dec 28 01:19:48 2013	(r259983)
@@ -131,7 +131,9 @@ static int	in6_mc_get(struct ifnet *, co
 static int	in6m_get_source(struct in6_multi *inm,
 		    const struct in6_addr *addr, const int noalloc,
 		    struct ip6_msource **pims);
+#ifdef KTR
 static int	in6m_is_ifp_detached(const struct in6_multi *);
+#endif
 static int	in6m_merge(struct in6_multi *, /*const*/ struct in6_mfilter *);
 static void	in6m_purge(struct in6_multi *);
 static void	in6m_reap(struct in6_multi *);
@@ -175,6 +177,7 @@ static SYSCTL_NODE(_net_inet6_ip6_mcast,
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip6_mcast_filters,
     "Per-interface stack-wide source filters");
 
+#ifdef KTR
 /*
  * Inline function which wraps assertions for a valid ifp.
  * The ifnet layer will set the ifma's ifp pointer to NULL if the ifp
@@ -197,6 +200,7 @@ in6m_is_ifp_detached(const struct in6_mu
 
 	return (ifp == NULL);
 }
+#endif
 
 /*
  * Initialize an in6_mfilter structure to a known state at t0, t1