diff options
author | ume <ume@FreeBSD.org> | 2003-10-25 10:57:08 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2003-10-25 10:57:08 +0000 |
commit | bbeee5f0f7058e560ca69d8cea4919632fb89430 (patch) | |
tree | 9f2e5ec31adfd4386b1149e998d73634beb2eb3e /sys/netinet/ip6.h | |
parent | b3c1e801753069192b4fa8fc22662fa3052ec7c7 (diff) | |
download | FreeBSD-src-bbeee5f0f7058e560ca69d8cea4919632fb89430.zip FreeBSD-src-bbeee5f0f7058e560ca69d8cea4919632fb89430.tar.gz |
revert following unwanted changes:
- __packed to __attribute__((__packed__)
- uintN_t back to u_intN_t
Reported by: bde
Diffstat (limited to 'sys/netinet/ip6.h')
-rw-r--r-- | sys/netinet/ip6.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index 8a54231..336ef48 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -85,7 +85,7 @@ struct ip6_hdr { } ip6_ctlun; struct in6_addr ip6_src; /* source address */ struct in6_addr ip6_dst; /* destination address */ -} __attribute__((__packed__)); +} __packed; #define ip6_vfc ip6_ctlun.ip6_un2_vfc #define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow @@ -119,7 +119,7 @@ struct ip6_hdr { struct ip6_ext { u_int8_t ip6e_nxt; u_int8_t ip6e_len; -} __attribute__((__packed__)); +} __packed; /* Hop-by-Hop options header */ /* XXX should we pad it to force alignment on an 8-byte boundary? */ @@ -127,7 +127,7 @@ struct ip6_hbh { u_int8_t ip6h_nxt; /* next header */ u_int8_t ip6h_len; /* length in units of 8 octets */ /* followed by options */ -} __attribute__((__packed__)); +} __packed; /* Destination options header */ /* XXX should we pad it to force alignment on an 8-byte boundary? */ @@ -135,7 +135,7 @@ struct ip6_dest { u_int8_t ip6d_nxt; /* next header */ u_int8_t ip6d_len; /* length in units of 8 octets */ /* followed by options */ -} __attribute__((__packed__)); +} __packed; /* Option types and related macros */ #define IP6OPT_PAD1 0x00 /* 00 0 00000 */ @@ -173,7 +173,7 @@ struct ip6_rthdr { u_int8_t ip6r_type; /* routing type */ u_int8_t ip6r_segleft; /* segments left */ /* followed by routing type specific data */ -} __attribute__((__packed__)); +} __packed; /* Type 0 Routing header */ struct ip6_rthdr0 { @@ -183,7 +183,7 @@ struct ip6_rthdr0 { u_int8_t ip6r0_segleft; /* segments left */ u_int32_t ip6r0_reserved; /* reserved field */ /* followed by up to 127 struct in6_addr */ -} __attribute__((__packed__)); +} __packed; /* Fragment header */ struct ip6_frag { @@ -191,7 +191,7 @@ struct ip6_frag { u_int8_t ip6f_reserved; /* reserved field */ u_int16_t ip6f_offlg; /* offset, reserved, and flag */ u_int32_t ip6f_ident; /* identification */ -} __attribute__((__packed__)); +} __packed; #if BYTE_ORDER == BIG_ENDIAN #define IP6F_OFF_MASK 0xfff8 /* mask out offset from _offlg */ |