Module Name: src Committed By: rtr Date: Sat Apr 25 14:56:05 UTC 2015
Modified Files: src/sys/netinet6: dccp6_usrreq.c dccp6_var.h Log Message: fix missed parameter type change in dccp6_accept() to sockaddr * from mbuf * To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/netinet6/dccp6_usrreq.c cvs rdiff -u -r1.2 -r1.3 src/sys/netinet6/dccp6_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet6/dccp6_usrreq.c diff -u src/sys/netinet6/dccp6_usrreq.c:1.3 src/sys/netinet6/dccp6_usrreq.c:1.4 --- src/sys/netinet6/dccp6_usrreq.c:1.3 Fri Apr 24 22:32:37 2015 +++ src/sys/netinet6/dccp6_usrreq.c Sat Apr 25 14:56:05 2015 @@ -1,5 +1,5 @@ /* $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. @@ -31,7 +31,7 @@ */ #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" @@ -268,7 +268,7 @@ dccp6_accept(struct socket *so, struct s 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) { Index: src/sys/netinet6/dccp6_var.h diff -u src/sys/netinet6/dccp6_var.h:1.2 src/sys/netinet6/dccp6_var.h:1.3 --- src/sys/netinet6/dccp6_var.h:1.2 Sat Apr 4 04:33:39 2015 +++ src/sys/netinet6/dccp6_var.h Sat Apr 25 14:56:05 2015 @@ -1,5 +1,5 @@ /* $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 @@ -46,7 +46,7 @@ int dccp6_usrreq(struct socket *, int, s 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