diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 18:45:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:55 -0400 |
commit | 87bdc48d304191313203df9b98d783e1ab5a55ab (patch) | |
tree | 32f7bfb3a5fa7fe373f11e0ddadd95b6bcd9bd4f /include/linux | |
parent | 37fedd3aab6517daec628764c5d66dd8761fbe5f (diff) |
[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr
This patch removes the duplicate ipv6_{auth,esp,comp}_hdr structures since
they're identical to the IPv4 versions. Duplicating them would only create
problems for ourselves later when we need to add things like extended
sequence numbers.
I've also added transport header type conversion headers for these types
which are now used by the transforms.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ipv6.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 4ca60c3320fb..5d35a4cc3bff 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -96,27 +96,6 @@ struct ipv6_destopt_hao { | |||
96 | struct in6_addr addr; | 96 | struct in6_addr addr; |
97 | } __attribute__ ((__packed__)); | 97 | } __attribute__ ((__packed__)); |
98 | 98 | ||
99 | struct ipv6_auth_hdr { | ||
100 | __u8 nexthdr; | ||
101 | __u8 hdrlen; /* This one is measured in 32 bit units! */ | ||
102 | __be16 reserved; | ||
103 | __be32 spi; | ||
104 | __be32 seq_no; /* Sequence number */ | ||
105 | __u8 auth_data[0]; /* Length variable but >=4. Mind the 64 bit alignment! */ | ||
106 | }; | ||
107 | |||
108 | struct ipv6_esp_hdr { | ||
109 | __be32 spi; | ||
110 | __be32 seq_no; /* Sequence number */ | ||
111 | __u8 enc_data[0]; /* Length variable but >=8. Mind the 64 bit alignment! */ | ||
112 | }; | ||
113 | |||
114 | struct ipv6_comp_hdr { | ||
115 | __u8 nexthdr; | ||
116 | __u8 flags; | ||
117 | __be16 cpi; | ||
118 | }; | ||
119 | |||
120 | /* | 99 | /* |
121 | * IPv6 fixed header | 100 | * IPv6 fixed header |
122 | * | 101 | * |