Add changes in 4.2.1.

[tcpdump] / ip6.h

diff --git a/ip6.h b/ip6.h
index 0a80f39448d428c1dcf12b6abd13f261b43b175d..12c87ad29291ca0868bf361d99214e0ecbbb069e 100644 (file)
--- a/ip6.h
+++ b/ip6.h
@@ -88,20 +88,6 @@ struct ip6_hdr {
        struct in6_addr ip6_dst;        /* destination address */
 } UNALIGNED;
 
-/*
- * Pseudo header, used for higher layer checksumming.
- */
-union ip6_pseudo_hdr {
-    struct {
-       struct in6_addr ph_src;
-       struct in6_addr ph_dst;
-       u_int32_t       ph_len;
-       u_int8_t        ph_zero[3];
-       u_int8_t        ph_nxt;
-    } ph;
-    u_int16_t pa[20];
-} UNALIGNED;
-
 #define ip6_vfc                ip6_ctlun.ip6_un2_vfc
 #define ip6_flow       ip6_ctlun.ip6_un1.ip6_un1_flow
 #define ip6_plen       ip6_ctlun.ip6_un1.ip6_un1_plen
@@ -201,6 +187,6 @@ struct ip6_frag {
 #define IP6F_MORE_FRAG         0x0001  /* more-fragments flag */
 
 /* in print-ip6.c */
-extern int nextproto6_cksum(const struct ip6_hdr *, const u_short *, u_int, u_int);
+extern int nextproto6_cksum(const struct ip6_hdr *, const u_int8_t *, u_int, u_int);
 
 #endif /* not _NETINET_IP6_H_ */