Author: dim
Date: Sat Dec 28 01:15:34 2013
New Revision: 259982
URL: http://svnweb.freebsd.org/changeset/base/259982

Log:
  MFC r259839:
  
  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.

Modified:
  stable/9/sys/netinet/in_mcast.c
Directory Properties:
  stable/9/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/netinet/in_mcast.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/netinet/in_mcast.c
==============================================================================
--- stable/9/sys/netinet/in_mcast.c     Sat Dec 28 01:08:40 2013        
(r259981)
+++ stable/9/sys/netinet/in_mcast.c     Sat Dec 28 01:15:34 2013        
(r259982)
@@ -138,7 +138,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 *);
@@ -179,6 +181,7 @@ static SYSCTL_NODE(_net_inet_ip_mcast, O
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip_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
@@ -201,6 +204,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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"

Reply via email to