bring the netnatm usrreq's also up to speed on the addition of the

struct proc argument to the usrreq's routines...

2 files changed, 5 insertions, 19 deletions

diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 39868a1eab7..3cc75e67650 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm.c,v 1.9 2007/12/09 21:36:40 hshoexer Exp $	*/
+/*	$OpenBSD: natm.c,v 1.10 2008/05/27 19:57:45 thib Exp $	*/
 
 /*
  *
@@ -67,17 +67,8 @@ u_long natm0_recvspace = 16*1024;
  * user requests
  */
 
-#if defined(__NetBSD__)
-int natm_usrreq(so, req, m, nam, control)
-#elif defined(__OpenBSD__) || defined(__FreeBSD__)
-int natm_usrreq(so, req, m, nam, control)
-#endif
-struct socket *so;
-int req;
-struct mbuf *m, *nam, *control;
-#if defined(__NetBSD__)
-struct proc *p;
-#endif
+int natm_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
+    struct mbuf *control, struct proc *p)
 {
   int error = 0, s, s2;
   struct natmpcb *npcb;
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 3d77fe165fe..9c72c5d6a61 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm.h,v 1.6 2002/03/14 01:27:12 millert Exp $	*/
+/*	$OpenBSD: natm.h,v 1.7 2008/05/27 19:57:45 thib Exp $	*/
 
 /*
  *
@@ -138,13 +138,8 @@ void	npcb_free(struct natmpcb *, int);
 struct	natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int);
 
 /* natm.c */
-#if defined(__NetBSD__)
 int	natm_usrreq(struct socket *, int, struct mbuf *,
-                             struct mbuf *, struct mbuf *, struct proc *);
-#elif defined(__OpenBSD__) || defined(FreeBSD)
-int	natm_usrreq(struct socket *, int, struct mbuf *,
-                             struct mbuf *, struct mbuf *);
-#endif
+	    struct mbuf *, struct mbuf *, struct proc *);
 int	natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 int	natm5_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 void	natmintr(void);