diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 02:40:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 02:40:16 +0200 |
| commit | 1ff8419871ea757ae0298aa296bcff9b2ca48561 (patch) | |
| tree | ff2194bc75f06107e16220ce303ef546f9a4c769 /include/net | |
| parent | MFD_TC6393XB is ARM-only (diff) | |
| parent | ipsec: ipcomp - Decompress into frags if necessary (diff) | |
| download | linux-1ff8419871ea757ae0298aa296bcff9b2ca48561.tar.xz linux-1ff8419871ea757ae0298aa296bcff9b2ca48561.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipsec: ipcomp - Decompress into frags if necessary
ipsec: ipcomp - Merge IPComp implementations
pkt_sched: Fix locking in shutdown_scheduler_queue()
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipcomp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h index 330b74e813a9..2a1092abaa07 100644 --- a/include/net/ipcomp.h +++ b/include/net/ipcomp.h @@ -14,6 +14,12 @@ struct ipcomp_data { struct ip_comp_hdr; struct sk_buff; +struct xfrm_state; + +int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb); +int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb); +void ipcomp_destroy(struct xfrm_state *x); +int ipcomp_init_state(struct xfrm_state *x); static inline struct ip_comp_hdr *ip_comp_hdr(const struct sk_buff *skb) { |