svn commit: r259839 - head/sys/netinet

Dimitry Andric dim at FreeBSD.org
Tue Dec 24 20:25:19 UTC 2013


Author: dim
Date: Tue Dec 24 20:25:18 2013
New Revision: 259839
URL: http://svnweb.freebsd.org/changeset/base/259839

Log:
  In sys/netinet/in_mcast.c, inm_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/netinet/in_mcast.c

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Tue Dec 24 19:58:27 2013	(r259838)
+++ head/sys/netinet/in_mcast.c	Tue Dec 24 20:25:18 2013	(r259839)
@@ -140,7 +140,9 @@ static int	in_getmulti(struct ifnet *, c
 		    struct in_multi **);
 static int	inm_get_source(struct in_multi *inm, const in_addr_t haddr,
 		    const int noalloc, struct ip_msource **pims);
+#ifdef KTR
 static int	inm_is_ifp_detached(const struct in_multi *);
+#endif
 static int	inm_merge(struct in_multi *, /*const*/ struct in_mfilter *);
 static void	inm_purge(struct in_multi *);
 static void	inm_reap(struct in_multi *);
@@ -187,6 +189,7 @@ static STAILQ_HEAD(, ip_moptions) imo_gc
     STAILQ_HEAD_INITIALIZER(imo_gc_list);
 static struct task imo_gc_task = TASK_INITIALIZER(0, inp_gcmoptions, NULL);
 
+#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
@@ -209,6 +212,7 @@ inm_is_ifp_detached(const struct in_mult
 
 	return (ifp == NULL);
 }
+#endif
 
 /*
  * Initialize an in_mfilter structure to a known state at t0, t1


More information about the svn-src-head mailing list