Backout CHANGES update - wrong branch

[tcpdump] / ip6.h

diff --git a/ip6.h b/ip6.h
index 8e3ccfde5d9510e56d073142aa9db7795881b577..d88bd7ea0281daea33aa43d7c6939382487db803 100644 (file)
--- a/ip6.h
+++ b/ip6.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ip6.h,v 1.3 2000-12-17 23:07:48 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ip6.h,v 1.6.4.1 2005-04-20 10:04:37 guy Exp $ (LBL) */

 /*     $NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp $   */
 /*     $KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $     */
 
 /*     $NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp $   */
 /*     $KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $     */
 


@@ -95,9 +95,6 @@ struct ip6_hdr {
 #define ip6_hlim       ip6_ctlun.ip6_un1.ip6_un1_hlim
 #define ip6_hops       ip6_ctlun.ip6_un1.ip6_un1_hlim
 
 #define ip6_hlim       ip6_ctlun.ip6_un1.ip6_un1_hlim
 #define ip6_hops       ip6_ctlun.ip6_un1.ip6_un1_hlim
 

-#define IPV6_VERSION           0x60
-#define IPV6_VERSION_MASK      0xf0
-

 /* in network endian */
 #define IPV6_FLOWINFO_MASK     ((u_int32_t)htonl(0x0fffffff))  /* flow info (28 bits) */
 #define IPV6_FLOWLABEL_MASK    ((u_int32_t)htonl(0x000fffff))  /* flow label (20 bits) */
 /* in network endian */
 #define IPV6_FLOWINFO_MASK     ((u_int32_t)htonl(0x0fffffff))  /* flow info (28 bits) */
 #define IPV6_FLOWLABEL_MASK    ((u_int32_t)htonl(0x000fffff))  /* flow label (20 bits) */


@@ -187,9 +184,8 @@ struct ip6_frag {
        u_int32_t ip6f_ident;           /* identification */
 };
 
        u_int32_t ip6f_ident;           /* identification */
 };
 

-/* network endian */
-#define IP6F_OFF_MASK          ((u_int16_t)htons(0xfff8))      /* mask out offset from _offlg */
-#define IP6F_RESERVED_MASK     ((u_int16_t)htons(0x0006))      /* reserved bits in ip6f_offlg */
-#define IP6F_MORE_FRAG         ((u_int16_t)htons(0x0001))      /* more-fragments flag */
+#define IP6F_OFF_MASK          0xfff8  /* mask out offset from ip6f_offlg */
+#define IP6F_RESERVED_MASK     0x0006  /* reserved bits in ip6f_offlg */
+#define IP6F_MORE_FRAG         0x0001  /* more-fragments flag */

 
 #endif /* not _NETINET_IP6_H_ */
 
 #endif /* not _NETINET_IP6_H_ */