From owner-svn-src-head@FreeBSD.ORG  Sat Jul 12 05:40:14 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3AD31A47;
 Sat, 12 Jul 2014 05:40:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 285FB2065;
 Sat, 12 Jul 2014 05:40:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6C5eEcn045065;
 Sat, 12 Jul 2014 05:40:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6C5eDUg045063;
 Sat, 12 Jul 2014 05:40:13 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201407120540.s6C5eDUg045063@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 12 Jul 2014 05:40:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268557 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jul 2014 05:40:14 -0000

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 *