svn commit: r356638 - head/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sat Jan 11 18:55:12 2020
New Revision: 356638
URL: https://svnweb.freebsd.org/changeset/base/356638

Log:
  in6_mcast: make in6_joingroup_locked() static
  
  in6_joingroup_locked() is only used file-local. No need to export it
  hance make it static.

Modified:
  head/sys/netinet6/in6_mcast.c
  head/sys/netinet6/in6_var.h

Modified: head/sys/netinet6/in6_mcast.c
==============================================================================
--- head/sys/netinet6/in6_mcast.c	Sat Jan 11 18:36:10 2020	(r356637)
+++ head/sys/netinet6/in6_mcast.c	Sat Jan 11 18:55:12 2020	(r356638)
@@ -121,8 +121,6 @@ MTX_SYSINIT(in6_multi_free_mtx, &in6_multi_free_mtx, "
 struct sx in6_multi_sx;
 SX_SYSINIT(in6_multi_sx, &in6_multi_sx, "in6_multi_sx");
 
-
-
 static void	im6f_commit(struct in6_mfilter *);
 static int	im6f_get_source(struct in6_mfilter *imf,
 		    const struct sockaddr_in6 *psin,
@@ -144,6 +142,8 @@ static void	im6s_merge(struct ip6_msource *ims,
 		    const struct in6_msource *lims, const int rollback);
 static int	in6_getmulti(struct ifnet *, const struct in6_addr *,
 		    struct in6_multi **);
+static int	in6_joingroup_locked(struct ifnet *, const struct in6_addr *,
+		    struct in6_mfilter *, struct in6_multi **, int);
 static int	in6m_get_source(struct in6_multi *inm,
 		    const struct in6_addr *addr, const int noalloc,
 		    struct ip6_msource **pims);
@@ -1197,7 +1197,7 @@ in6_joingroup(struct ifnet *ifp, const struct in6_addr
  * If the MLD downcall fails, the group is not joined, and an error
  * code is returned.
  */
-int
+static int
 in6_joingroup_locked(struct ifnet *ifp, const struct in6_addr *mcaddr,
     /*const*/ struct in6_mfilter *imf, struct in6_multi **pinm,
     const int delay)

Modified: head/sys/netinet6/in6_var.h
==============================================================================
--- head/sys/netinet6/in6_var.h	Sat Jan 11 18:36:10 2020	(r356637)
+++ head/sys/netinet6/in6_var.h	Sat Jan 11 18:55:12 2020	(r356638)
@@ -863,8 +863,6 @@ int	im6o_mc_filter(const struct ip6_moptions *, const 
 	    const struct sockaddr *, const struct sockaddr *);
 int in6_joingroup(struct ifnet *, const struct in6_addr *,
 	    struct in6_mfilter *, struct in6_multi **, int);
-int	in6_joingroup_locked(struct ifnet *, const struct in6_addr *,
-	    struct in6_mfilter *, struct in6_multi **, int);
 int	in6_leavegroup(struct in6_multi *, struct in6_mfilter *);
 int	in6_leavegroup_locked(struct in6_multi *, struct in6_mfilter *);
 void	in6m_clear_recorded(struct in6_multi *);