Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net fix missed conversion to call to pr_connect() from p...



details:   https://anonhg.NetBSD.org/src/rev/2581da74effd
branches:  trunk
changeset: 331093:2581da74effd
user:      rtr <rtr%NetBSD.org@localhost>
date:      Thu Jul 31 05:13:53 2014 +0000

description:
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.

diffstat:

 sys/net/raw_usrreq.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 377527091218 -r 2581da74effd sys/net/raw_usrreq.c
--- a/sys/net/raw_usrreq.c      Thu Jul 31 03:50:09 2014 +0000
+++ b/sys/net/raw_usrreq.c      Thu Jul 31 05:13:53 2014 +0000
@@ -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 @@
                                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);



Home | Main Index | Thread Index | Old Index