diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-04-01 03:54:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-04-01 03:54:16 -0500 |
commit | dbe5b4aaafc715b12dbbea309d3d17958d01fd65 (patch) | |
tree | 936518ad9d5452f5efe18e0107255eab0aafb58d /include/net/xfrm.h | |
parent | e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0 (diff) |
[IPSEC]: Kill unused decap state structure
This patch removes the *_decap_state structures which were previously
used to share state between input/post_input. This is no longer
needed.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c7612f4443ed..0d5529c382e8 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -242,7 +242,6 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); | |||
242 | 242 | ||
243 | extern void xfrm_state_delete_tunnel(struct xfrm_state *x); | 243 | extern void xfrm_state_delete_tunnel(struct xfrm_state *x); |
244 | 244 | ||
245 | struct xfrm_decap_state; | ||
246 | struct xfrm_type | 245 | struct xfrm_type |
247 | { | 246 | { |
248 | char *description; | 247 | char *description; |
@@ -606,25 +605,11 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | |||
606 | 605 | ||
607 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); | 606 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); |
608 | 607 | ||
609 | /* Decapsulation state, used by the input to store data during | ||
610 | * decapsulation procedure, to be used later (during the policy | ||
611 | * check | ||
612 | */ | ||
613 | struct xfrm_decap_state { | ||
614 | char decap_data[20]; | ||
615 | __u16 decap_type; | ||
616 | }; | ||
617 | |||
618 | struct sec_decap_state { | ||
619 | struct xfrm_state *xvec; | ||
620 | struct xfrm_decap_state decap; | ||
621 | }; | ||
622 | |||
623 | struct sec_path | 608 | struct sec_path |
624 | { | 609 | { |
625 | atomic_t refcnt; | 610 | atomic_t refcnt; |
626 | int len; | 611 | int len; |
627 | struct sec_decap_state x[XFRM_MAX_DEPTH]; | 612 | struct xfrm_state *xvec[XFRM_MAX_DEPTH]; |
628 | }; | 613 | }; |
629 | 614 | ||
630 | static inline struct sec_path * | 615 | static inline struct sec_path * |