Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For some peverse reason the ISO code has to have the same template for 

it's iso_pcbconnect() as the IP stack.
This commit is contained in:
dsl 2005-11-16 20:44:19 +00:00
parent b141897d50
commit d12c019f70
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netiso/cltp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cltp_usrreq.c,v 1.25 2004/04/25 21:13:13 matt Exp $ */
/* $NetBSD: cltp_usrreq.c,v 1.26 2005/11/16 20:44:19 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cltp_usrreq.c,v 1.25 2004/04/25 21:13:13 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: cltp_usrreq.c,v 1.26 2005/11/16 20:44:19 dsl Exp $");
#ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */
#include <sys/param.h>
@ -341,7 +341,7 @@ cltp_usrreq(so, req, m, nam, control, p)
break;
case PRU_CONNECT:
error = iso_pcbconnect(isop, nam);
error = iso_pcbconnect(isop, nam, p);
if (error)
break;
soisconnected(so);
@ -376,7 +376,7 @@ cltp_usrreq(so, req, m, nam, control, p)
error = EISCONN;
goto die;
}
error = iso_pcbconnect(isop, nam);
error = iso_pcbconnect(isop, nam, p);
if (error) {
die:
m_freem(m);

6
sys/netiso/iso_pcb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso_pcb.c,v 1.27 2004/04/19 05:16:45 matt Exp $ */
/* $NetBSD: iso_pcb.c,v 1.28 2005/11/16 20:44:19 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -62,7 +62,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iso_pcb.c,v 1.27 2004/04/19 05:16:45 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: iso_pcb.c,v 1.28 2005/11/16 20:44:19 dsl Exp $");
#include "opt_iso.h"
@ -279,7 +279,7 @@ noname:
* NOTES:
*/
int
iso_pcbconnect(void *v, struct mbuf *nam)
iso_pcbconnect(void *v, struct mbuf *nam, struct proc *p)
{
struct isopcb *isop = v;
struct sockaddr_iso *siso = mtod(nam, struct sockaddr_iso *);

4
sys/netiso/iso_pcb.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso_pcb.h,v 1.11 2004/04/20 02:13:26 matt Exp $ */
/* $NetBSD: iso_pcb.h,v 1.12 2005/11/16 20:44:19 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -116,7 +116,7 @@ struct sockaddr_iso;
int iso_pcballoc (struct socket *, void *);
int iso_pcbbind (void *, struct mbuf *, struct proc *);
int iso_pcbconnect (void *, struct mbuf *);
int iso_pcbconnect (void *, struct mbuf *, struct proc *);
void iso_pcbdisconnect (void *);
void iso_pcbdetach (void *);
void iso_pcbnotify (struct isopcb *, struct sockaddr_iso *, int,

4
sys/netiso/tp_pcb.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_pcb.h,v 1.17 2005/02/26 22:39:49 perry Exp $ */
/* $NetBSD: tp_pcb.h,v 1.18 2005/11/16 20:44:19 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -138,7 +138,7 @@ struct nl_protosw {
int (*nlp_pcbbind) /* bind to pcb for net level */
(void *, struct mbuf *, struct proc *);
int (*nlp_pcbconn) /* connect for net level */
(void *, struct mbuf *);
(void *, struct mbuf *, struct proc *);
void (*nlp_pcbdisc) /* disconnect net level */
(void *);
void (*nlp_pcbdetach) /* detach net level pcb */

6
sys/netiso/tp_subr2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_subr2.c,v 1.27 2005/05/29 21:27:45 christos Exp $ */
/* $NetBSD: tp_subr2.c,v 1.28 2005/11/16 20:44:19 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -66,7 +66,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tp_subr2.c,v 1.27 2005/05/29 21:27:45 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tp_subr2.c,v 1.28 2005/11/16 20:44:19 dsl Exp $");
/*
* this def'n is to cause the expansion of this macro in the routine
@ -714,7 +714,7 @@ tp_route_to(struct mbuf *m, struct tp_pcb *tpcb, caddr_t channel)
}
#endif
tpcb->tp_nlproto = nl_protosw + tpcb->tp_netservice;
error = (*tpcb->tp_nlproto->nlp_pcbconn) (tpcb->tp_npcb, m);
error = (*tpcb->tp_nlproto->nlp_pcbconn) (tpcb->tp_npcb, m, NULL);
}
if (error)
goto done;