svn commit: r259840 - head/sys/netinet6

Dimitry Andric dim at FreeBSD.org
Tue Dec 24 20:30:13 UTC 2013


Author: dim
Date: Tue Dec 24 20:30:13 2013
New Revision: 259840
URL: http://svnweb.freebsd.org/changeset/base/259840

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/sys/netinet6/in6_mcast.c

Modified: head/sys/netinet6/in6_mcast.c
==============================================================================
--- head/sys/netinet6/in6_mcast.c	Tue Dec 24 20:25:18 2013	(r259839)
+++ head/sys/netinet6/in6_mcast.c	Tue Dec 24 20:30:13 2013	(r259840)
@@ -132,7 +132,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 *);
@@ -176,6 +178,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
@@ -198,6 +201,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


More information about the svn-src-head mailing list