 @@ -1,15 +1,15 @@
 /*	$KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $	*/
-/*	$NetBSD: dccp6_usrreq.c,v 1.3 2015/04/24 22:32:37 rtr Exp $ */
+/*	$NetBSD: dccp6_usrreq.c,v 1.4 2015/04/25 14:56:05 rtr Exp $ */
 /*
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.3 2015/04/24 22:32:37 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.4 2015/04/25 14:56:05 rtr Exp $");
 #include "opt_inet.h"
 #include "opt_dccp.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 @@ -258,27 +258,27 @@ dccp6_listen(struct socket *so, struct l
 		dp->seq_snd = 512;
+	}
 	INP_UNLOCK(inp);
 	return error;
+}
 int
 dccp6_accept(struct socket *so, struct sockaddr *nam)
+{
 	struct in6pcb *in6p = NULL;
 	int error = 0;
 	DCCP_DEBUG((LOG_INFO, "Entering dccp6_accept!\n"));
-	if (m == NULL) {
+	if (nam == NULL) {
 		return EINVAL;
+	}
 	if (so->so_state & SS_ISDISCONNECTED) {
 		DCCP_DEBUG((LOG_INFO, "so_state && SS_ISDISCONNECTED!, so->state = %i\n", so->so_state));
 		return ECONNABORTED;
+	}
 	INP_INFO_RLOCK(&dccpbinfo);
 	in6p = sotoin6pcb(so);
 	if (in6p == 0) {
 		INP_INFO_RUNLOCK(&dccpbinfo);
 		return EINVAL;
+	}

 @@ -1,15 +1,15 @@
 /*	$KAME: dccp6_var.h,v 1.3 2003/11/18 04:55:43 ono Exp $	*/
-/*	$NetBSD: dccp6_var.h,v 1.2 2015/04/04 04:33:39 rtr Exp $ */
+/*	$NetBSD: dccp6_var.h,v 1.3 2015/04/25 14:56:05 rtr Exp $ */
 /*
  * Copyright (c) 2003 Joacim H�ggmark
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -36,17 +36,17 @@
 #ifdef _KERNEL
 extern const struct	pr_usrreqs dccp6_usrreqs;
 extern struct	in6pcb dccpb6;
 void *	dccp6_ctlinput(int, const struct sockaddr *, void *);
 int	dccp6_input(struct mbuf **, int *, int);
 int	dccp6_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
 		     struct mbuf *, struct lwp *);
 int	dccp6_bind(struct socket *, struct sockaddr *, struct lwp *);
 int	dccp6_listen(struct socket *, struct lwp *);
 int	dccp6_connect(struct socket *, struct mbuf *, struct lwp *);
-int	dccp6_accept(struct socket *, struct mbuf *);
+int	dccp6_accept(struct socket *, struct sockaddr *);
 #endif
 #endif