Re: [PATCH] [XFRM] Beet: Fix output for ipv6

[Joakim Koskela <joakim.koskela@hiit.fi>]

Hi Herbert, 

Have you had a chance to look this, or are you working on something else for 
it?

On Friday 08 February 2008 18:12, Joakim Koskela wrote:
> Hi,
>
> This patch fixes the ipv6 mode of ipsec beet. It has been using logic
> similar to tunnel mode, making it crash during esp packaging.
>
> Signed-off-by: Joakim Koskela <jookos@gmail.com>
> ---
>  net/ipv6/xfrm6_mode_beet.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
> index 0527d11..0395800 100644
> --- a/net/ipv6/xfrm6_mode_beet.c
> +++ b/net/ipv6/xfrm6_mode_beet.c
> @@ -40,11 +40,14 @@ static void xfrm6_beet_make_header(struct sk_buff *skb)
>  static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
>  {
>  	struct ipv6hdr *top_iph;
> +	u8 *prevhdr;
> +	int hdr_len;
>
> +	hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
> +	skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
>  	skb_set_network_header(skb, -x->props.header_len);
> -	skb->mac_header = skb->network_header +
> -			  offsetof(struct ipv6hdr, nexthdr);
> -	skb->transport_header = skb->network_header + sizeof(*top_iph);
> +	skb->transport_header = skb->network_header + hdr_len;
> +	__skb_pull(skb, hdr_len);
>
>  	xfrm6_beet_make_header(skb);
>