summaryrefslogtreecommitdiff
path: root/sys/netinet6/ip6.h
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-01-03 12:34:24 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-01-03 12:34:24 +0000
commit85182a80f7f26112604b964bc5651077a30fd464 (patch)
treeccbdc1830bd90064c73115ca44c6a447d77b1e5b /sys/netinet6/ip6.h
parentd101875ddccff8712266e64ada956b3f22fd1504 (diff)
Remove ifdef'd out macros.
Diffstat (limited to 'sys/netinet6/ip6.h')
-rw-r--r--sys/netinet6/ip6.h40
1 files changed, 1 insertions, 39 deletions
diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h
index f7d70ea1731..47ec642c291 100644
--- a/sys/netinet6/ip6.h
+++ b/sys/netinet6/ip6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6.h,v 1.1 1999/12/08 06:50:21 itojun Exp $ */
+/* $OpenBSD: ip6.h,v 1.2 2000/01/03 12:34:23 angelos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -246,42 +246,4 @@ do { \
} \
} while (0)
-#ifdef __NetBSD__
-/*
- * IP6_EXTHDR_GET ensures that intermediate protocol header (from "off" to
- * "len") is located in single mbuf, on contiguous memory region.
- * The pointer to the region will be returned to pointer variable "val",
- * with type "typ".
- * IP6_EXTHDR_GET0 does the same, except that it aligns the structure at the
- * very top of mbuf. GET0 is likely to make memory copy than GET.
- *
- * XXX we're now testing this, needs m_pulldown()
- */
-#define IP6_EXTHDR_GET(val, typ, m, off, len) \
-do { \
- struct mbuf *t; \
- int tmp; \
- t = m_pulldown((m), (off), (len), &tmp); \
- if (t) { \
- if (t->m_len < tmp + (len)) \
- panic("m_pulldown malfunction"); \
- (val) = (typ)(mtod(t, caddr_t) + tmp); \
- } else \
- (val) = (typ)NULL; \
-} while (0)
-
-#define IP6_EXTHDR_GET0(val, typ, m, off, len) \
-do { \
- struct mbuf *t; \
- t = m_pulldown((m), (off), (len), NULL); \
- if (t) { \
- if (t->m_len < (len)) \
- panic("m_pulldown malfunction"); \
- (val) = (typ)mtod(t, caddr_t); \
- } else \
- (val) = (typ)NULL; \
-} while (0)
-
-#endif /*NetBSD*/
-
#endif /* not _NETINET_IPV6_H_ */