diff options
Diffstat (limited to 'include/linux/in6.h')
-rw-r--r-- | include/linux/in6.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h index 718bf21c5754..bd55c6e46b2e 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h | |||
@@ -27,10 +27,8 @@ | |||
27 | * IPv6 address structure | 27 | * IPv6 address structure |
28 | */ | 28 | */ |
29 | 29 | ||
30 | struct in6_addr | 30 | struct in6_addr { |
31 | { | 31 | union { |
32 | union | ||
33 | { | ||
34 | __u8 u6_addr8[16]; | 32 | __u8 u6_addr8[16]; |
35 | __be16 u6_addr16[8]; | 33 | __be16 u6_addr16[8]; |
36 | __be32 u6_addr32[4]; | 34 | __be32 u6_addr32[4]; |
@@ -75,8 +73,7 @@ struct ipv6_mreq { | |||
75 | 73 | ||
76 | #define ipv6mr_acaddr ipv6mr_multiaddr | 74 | #define ipv6mr_acaddr ipv6mr_multiaddr |
77 | 75 | ||
78 | struct in6_flowlabel_req | 76 | struct in6_flowlabel_req { |
79 | { | ||
80 | struct in6_addr flr_dst; | 77 | struct in6_addr flr_dst; |
81 | __be32 flr_label; | 78 | __be32 flr_label; |
82 | __u8 flr_action; | 79 | __u8 flr_action; |
@@ -113,7 +110,7 @@ struct in6_flowlabel_req | |||
113 | #define IPV6_FLOWINFO_FLOWLABEL 0x000fffff | 110 | #define IPV6_FLOWINFO_FLOWLABEL 0x000fffff |
114 | #define IPV6_FLOWINFO_PRIORITY 0x0ff00000 | 111 | #define IPV6_FLOWINFO_PRIORITY 0x0ff00000 |
115 | 112 | ||
116 | /* These defintions are obsolete */ | 113 | /* These definitions are obsolete */ |
117 | #define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 | 114 | #define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 |
118 | #define IPV6_PRIORITY_FILLER 0x0100 | 115 | #define IPV6_PRIORITY_FILLER 0x0100 |
119 | #define IPV6_PRIORITY_UNATTENDED 0x0200 | 116 | #define IPV6_PRIORITY_UNATTENDED 0x0200 |