[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200808041619.29180.joakim.koskela@hiit.fi>
Date: Mon, 4 Aug 2008 16:19:28 +0300
From: Joakim Koskela <joakim.koskela@...t.fi>
To: netdev@...r.kernel.org
Cc: Herbert Xu <herbert@...dor.apana.org.au>, yoshfuji@...e.ad.jp
Subject: [PATCH 1/2] Interfamily IPSec BEET
This fixes the ipv6-inner, ipv4-outer mode. The difference between the
two ip versions header lenghts wasn't taken into account when
re-adjusting the network header of the sk_buffs.
Signed-off-by: Joakim Koskela <jookos@...il.com>
---
net/ipv4/xfrm4_mode_beet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 9c798ab..49145b0 100644
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -48,7 +48,7 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct
sk_buff *skb)
hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len -
- hdrlen);
+ hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph)));
skb->mac_header = skb->network_header +
offsetof(struct iphdr, protocol);
skb->transport_header = skb->network_header + sizeof(*top_iph);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists