summaryrefslogtreecommitdiff
path: root/sys/netnatm/natm.h
diff options
context:
space:
mode:
authorchuck <chuck@cvs.openbsd.org>1996-07-03 17:24:31 +0000
committerchuck <chuck@cvs.openbsd.org>1996-07-03 17:24:31 +0000
commit73e06b23207009eef589976eeefda52b10cd5f05 (patch)
tree3a40ebce4d966231faf9043f994e0ab413ee0b59 /sys/netnatm/natm.h
parent5965b4a0810d35646281676f2d88192803f36981 (diff)
ported to FreeBSD 2.2-960612-SNAP.
Diffstat (limited to 'sys/netnatm/natm.h')
-rw-r--r--sys/netnatm/natm.h21
1 files changed, 20 insertions, 1 deletions
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 143d1623cc4..032c59d35fa 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: natm.h,v 1.1 1996/06/30 21:40:14 chuck Exp $ */
+/* $OpenBSD: natm.h,v 1.2 1996/07/03 17:24:30 chuck Exp $ */
/*
*
@@ -57,6 +57,20 @@ struct sockaddr_natm {
};
+#if defined(__FreeBSD__) && defined(KERNEL)
+
+#ifndef _KERNEL
+#define _KERNEL
+#endif
+
+#define SPLSOFTNET() splnet()
+
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+
+#define SPLSOFTNET() splsoftnet()
+
+#endif
+
#ifdef _KERNEL
/*
@@ -124,8 +138,13 @@ void npcb_free __P((struct natmpcb *, int));
struct natmpcb *npcb_add __P((struct natmpcb *, struct ifnet *, int, int));
/* natm.c */
+#if defined(__NetBSD__) || defined(__OpenBSD__)
int natm_usrreq __P((struct socket *, int, struct mbuf *,
struct mbuf *, struct mbuf *, struct proc *));
+#elif defined(__FreeBSD__)
+int natm_usrreq __P((struct socket *, int, struct mbuf *,
+ struct mbuf *, struct mbuf *));
+#endif
int natm0_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
int natm5_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
void natmintr __P((void));