Tue Oct 17 14:53:23 2017 UTC ()
Remove function prototype that is no longer required. NFC


(rjs)
diff -r1.9 -r1.10 src/sys/netinet/sctp_pcb.c
cvs diff -r1.9 -r1.10 src/sys/netinet/sctp_pcb.c (expand / switch to unified diff)

--- src/sys/netinet/sctp_pcb.c 2017/06/28 13:22:28 1.9
+++ src/sys/netinet/sctp_pcb.c 2017/10/17 14:53:23 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1/* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */ 1/* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */
2/* $NetBSD: sctp_pcb.c,v 1.9 2017/06/28 13:22:28 rjs Exp $ */ 2/* $NetBSD: sctp_pcb.c,v 1.10 2017/10/17 14:53:23 rjs Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. 5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND 23 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND
24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE 26 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE
27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 */ 34 */
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.9 2017/06/28 13:22:28 rjs Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.10 2017/10/17 14:53:23 rjs Exp $");
37 37
38#ifdef _KERNEL_OPT 38#ifdef _KERNEL_OPT
39#include "opt_inet.h" 39#include "opt_inet.h"
40#include "opt_sctp.h" 40#include "opt_sctp.h"
41#endif /* _KERNEL_OPT */ 41#endif /* _KERNEL_OPT */
42 42
43#include <sys/param.h> 43#include <sys/param.h>
44#include <sys/systm.h> 44#include <sys/systm.h>
45#include <sys/malloc.h> 45#include <sys/malloc.h>
46#include <sys/mbuf.h> 46#include <sys/mbuf.h>
47#include <sys/domain.h> 47#include <sys/domain.h>
48#include <sys/protosw.h> 48#include <sys/protosw.h>
49#include <sys/socket.h> 49#include <sys/socket.h>
@@ -1661,35 +1661,26 @@ sctp_isport_inuse(struct sctp_inpcb *inp @@ -1661,35 +1661,26 @@ sctp_isport_inuse(struct sctp_inpcb *inp
1661#endif 1661#endif
1662#endif 1662#endif
1663 ) { 1663 ) {
1664 /* no conflict */ 1664 /* no conflict */
1665 continue; 1665 continue;
1666 } 1666 }
1667 /* else fall through to conflict */ 1667 /* else fall through to conflict */
1668 } 1668 }
1669 return (1); 1669 return (1);
1670 } 1670 }
1671 return (0); 1671 return (0);
1672} 1672}
1673 1673
1674#if !(defined(__FreeBSD__) || defined(__APPLE__)) 
1675/* 
1676 * Don't know why, but without this there is an unknown reference when 
1677 * compiling NetBSD... hmm 
1678 */ 
1679extern void in6_sin6_2_sin (struct sockaddr_in *, struct sockaddr_in6 *sin6); 
1680#endif 
1681 
1682 
1683int 1674int
1684sctp_inpcb_bind(struct socket *so, struct sockaddr *addr, struct lwp *l) 1675sctp_inpcb_bind(struct socket *so, struct sockaddr *addr, struct lwp *l)
1685{ 1676{
1686 /* bind a ep to a socket address */ 1677 /* bind a ep to a socket address */
1687 struct sctppcbhead *head; 1678 struct sctppcbhead *head;
1688 struct sctp_inpcb *inp, *inp_tmp; 1679 struct sctp_inpcb *inp, *inp_tmp;
1689 int bindall; 1680 int bindall;
1690 uint16_t lport; 1681 uint16_t lport;
1691 int error; 1682 int error;
1692 1683
1693 lport = 0; 1684 lport = 0;
1694 error = 0; 1685 error = 0;
1695 bindall = 1; 1686 bindall = 1;