diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2008-05-23 16:03:04 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2008-05-23 16:03:04 +0000 |
| commit | 3a553c9f38fd2cbb3a2a70e990104dbc95ccb5a7 (patch) | |
| tree | 4655c6a21a04c343bb2b8bb8ed0d0b9070fb91a9 /sys/netatalk | |
| parent | 114f984d932b1f6810293178a80279f30cd2bd27 (diff) | |
Make this compile again, by adding a struct proc * argument
to the usrreq's.
(Both MPLS and NETATALK are disabled in GENERIC).
Diffstat (limited to 'sys/netatalk')
| -rw-r--r-- | sys/netatalk/at_extern.h | 4 | ||||
| -rw-r--r-- | sys/netatalk/ddp_usrreq.c | 9 |
2 files changed, 6 insertions, 7 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; |