svn commit: r268557 - head/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Sat Jul 12 05:40:13 2014
New Revision: 268557
URL: http://svnweb.freebsd.org/changeset/base/268557

Log:
  Expose in_pcbbind_check_bindmulti() so the upcoming IPv6 RSS changes
  can be made to use it.

Modified:
  head/sys/netinet/in_pcb.c
  head/sys/netinet/in_pcb.h

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Sat Jul 12 04:34:39 2014	(r268556)
+++ head/sys/netinet/in_pcb.c	Sat Jul 12 05:40:13 2014	(r268557)
@@ -486,7 +486,6 @@ inp_so_options(const struct inpcb *inp)
 }
 #endif /* INET || INET6 */
 
-#ifdef INET
 /*
  * Check if a new BINDMULTI socket is allowed to be created.
  *
@@ -496,7 +495,7 @@ inp_so_options(const struct inpcb *inp)
  * This checks whether the existing inp also has BINDMULTI and
  * whether the credentials match.
  */
-static int
+int
 in_pcbbind_check_bindmulti(const struct inpcb *ni, const struct inpcb *oi)
 {
 	/* Check permissions match */
@@ -517,6 +516,7 @@ in_pcbbind_check_bindmulti(const struct 
 	return (1);
 }
 
+#ifdef INET
 /*
  * Set up a bind operation on a PCB, performing port allocation
  * as required, but do not actually modify the PCB. Callers can

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h	Sat Jul 12 04:34:39 2014	(r268556)
+++ head/sys/netinet/in_pcb.h	Sat Jul 12 05:40:13 2014	(r268557)
@@ -607,6 +607,9 @@ void	in_pcbinfo_destroy(struct inpcbinfo
 void	in_pcbinfo_init(struct inpcbinfo *, const char *, struct inpcbhead *,
 	    int, int, char *, uma_init, uma_fini, uint32_t, u_int);
 
+int	in_pcbbind_check_bindmulti(const struct inpcb *ni,
+	    const struct inpcb *oi);
+
 struct inpcbgroup *
 	in_pcbgroup_byhash(struct inpcbinfo *, u_int, uint32_t);
 struct inpcbgroup *