diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/in6.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/in6.h')
| -rw-r--r-- | include/linux/in6.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h index 718bf21c5754..dfa29168e6ab 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; |