diff options
| -rw-r--r-- | sys/netatalk/at_extern.h | 4 | ||||
| -rw-r--r-- | sys/netatalk/ddp_usrreq.c | 9 | ||||
| -rw-r--r-- | sys/netmpls/mpls.h | 4 | ||||
| -rw-r--r-- | sys/netmpls/mpls_raw.c | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h index f16e85c7914..aaf364272c1 100644 --- a/sys/netatalk/at_extern.h +++ b/sys/netatalk/at_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: at_extern.h,v 1.3 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: at_extern.h,v 1.4 2008/05/23 16:03:03 thib Exp $ */ /* $NetBSD: at_extern.h,v 1.3 1997/04/03 18:38:23 christos Exp $ */ /* @@ -97,7 +97,7 @@ int at_control(u_long, caddr_t, struct ifnet *, u_int16_t at_cksum(struct mbuf *, int); int ddp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, - struct mbuf *); + struct mbuf *, struct proc *); void ddp_init(void ); struct ifaddr *at_ifawithnet(struct sockaddr_at *, struct ifaddr *); int ddp_output(struct mbuf *, ...); diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index f3193ae421e..df96672e5b5 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ddp_usrreq.c,v 1.11 2007/12/14 18:33:40 deraadt Exp $ */ +/* $OpenBSD: ddp_usrreq.c,v 1.12 2008/05/23 16:03:03 thib Exp $ */ /* * Copyright (c) 1990,1994 Regents of The University of Michigan. @@ -73,7 +73,7 @@ #include <netatalk/at_extern.h> int ddp_usrreq(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf * ); + struct mbuf *, struct mbuf *, struct proc *); static void at_sockaddr( struct ddpcb *, struct mbuf * ); static int at_pcbsetaddr( struct ddpcb *, struct mbuf *, struct proc * ); @@ -99,13 +99,12 @@ u_long ddp_recvspace = 10 * ( 587 + sizeof( struct sockaddr_at )); /*ARGSUSED*/ int -ddp_usrreq( so, req, m, addr, rights ) +ddp_usrreq( so, req, m, addr, rights, p ) struct socket *so; int req; struct mbuf *m, *addr, *rights; + struct proc *p; { - /* XXX Need to pass p into this routine */ - struct proc *p = curproc; struct ddpcb *ddp; int error = 0; diff --git a/sys/netmpls/mpls.h b/sys/netmpls/mpls.h index e6b6eecc1d1..8858864d74b 100644 --- a/sys/netmpls/mpls.h +++ b/sys/netmpls/mpls.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls.h,v 1.10 2008/05/09 15:08:36 claudio Exp $ */ +/* $OpenBSD: mpls.h,v 1.11 2008/05/23 16:03:03 thib Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -154,7 +154,7 @@ void mpe_input(struct mbuf *, struct ifnet *, struct sockaddr_mpls *, u_int32_t); extern int mpls_raw_usrreq(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *); + struct mbuf *, struct mbuf *, struct proc *); extern struct ifqueue mplsintrq; /* MPLS input queue */ extern int mplsqmaxlen; /* MPLS input queue length */ diff --git a/sys/netmpls/mpls_raw.c b/sys/netmpls/mpls_raw.c index 75d41a8057c..1f3257cb7ab 100644 --- a/sys/netmpls/mpls_raw.c +++ b/sys/netmpls/mpls_raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_raw.c,v 1.2 2008/04/23 11:22:23 norby Exp $ */ +/* $OpenBSD: mpls_raw.c,v 1.3 2008/05/23 16:03:03 thib Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -78,7 +78,7 @@ mpls_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) int mpls_raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, - struct mbuf *control) + struct mbuf *control, struct proc *p) { int error = 0; |