Module Name:    src
Committed By:   rtr
Date:           Thu Jul 31 05:13:53 UTC 2014

Modified Files:
        src/sys/net: raw_usrreq.c

Log Message:
fix missed conversion to call to pr_connect() from pr_generic() when
PRU_CONNECT split was done.

-                       error = (*so->so_proto->pr_usrreqs->pr_generic)(so,
-                           PRU_CONNECT, NULL, nam, NULL, l);
+                       error = (*so->so_proto->pr_usrreqs->pr_connect)(so, 
nam);

without this change KASSERT() would be triggered if raw send needs to
perform a connect.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/net/raw_usrreq.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.47 src/sys/net/raw_usrreq.c:1.48
--- src/sys/net/raw_usrreq.c:1.47	Thu Jul 31 03:39:35 2014
+++ src/sys/net/raw_usrreq.c	Thu Jul 31 05:13:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_usrreq.c,v 1.47 2014/07/31 03:39:35 rtr Exp $	*/
+/*	$NetBSD: raw_usrreq.c,v 1.48 2014/07/31 05:13:53 rtr Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.47 2014/07/31 03:39:35 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.48 2014/07/31 05:13:53 rtr Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -216,8 +216,7 @@ raw_usrreq(struct socket *so, int req, s
 				error = EISCONN;
 				goto die;
 			}
-			error = (*so->so_proto->pr_usrreqs->pr_generic)(so,
-			    PRU_CONNECT, NULL, nam, NULL, l);
+			error = (*so->so_proto->pr_usrreqs->pr_connect)(so, nam);
 			if (error) {
 			die:
 				m_freem(m);

Reply via email to