From 2353e7443f1dfd8a562717064d5f7f64b1cafd09 Mon Sep 17 00:00:00 2001
From: Claudio Jeker <claudio@cvs.openbsd.org>
Date: Sun, 31 May 2009 19:17:21 +0000
Subject: Remove some #ifdef / #define maze that is not needed at all. OK
 deraadt@ miod@

---
 sys/netnatm/natm.c |  4 ++--
 sys/netnatm/natm.h | 16 +---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'sys/netnatm')

diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 3cc75e67650..2b1b77a1b32 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm.c,v 1.10 2008/05/27 19:57:45 thib Exp $	*/
+/*	$OpenBSD: natm.c,v 1.11 2009/05/31 19:17:20 claudio Exp $	*/
 
 /*
  *
@@ -79,7 +79,7 @@ int natm_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
   struct ifnet *ifp;
   int proto = so->so_proto->pr_protocol;
 
-  s = SPLSOFTNET();
+  s = splsoftnet();
 
   npcb = (struct natmpcb *) so->so_pcb;
 
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index e0fc8388bf6..ee92b713575 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm.h,v 1.8 2009/01/28 15:12:03 claudio Exp $	*/
+/*	$OpenBSD: natm.h,v 1.9 2009/05/31 19:17:20 claudio Exp $	*/
 
 /*
  *
@@ -57,20 +57,6 @@ 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
 
 /*
-- 
cgit v1.2.3