]>
Commit | Line | Data |
---|---|---|
0fca2e6c | 1 | diff -u -p -B -r1.1.1.1 sit.c |
2 | --- linux-2.6.0-test8/net/ipv6/sit.c 18 Oct 2003 01:37:19 -0000 1.1.1.1 | |
3 | +++ linux-2.6.0-test8/net/ipv6/sit.c 18 Oct 2003 04:13:21 -0000 | |
4 | @@ -377,8 +377,10 @@ static int ipip6_rcv(struct sk_buff *skb | |
5 | ||
6 | read_lock(&ipip6_lock); | |
7 | if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) { | |
8 | +#ifdef CONFIG_XFRM | |
9 | secpath_put(skb->sp); | |
10 | skb->sp = NULL; | |
11 | +#endif | |
12 | skb->mac.raw = skb->nh.raw; | |
13 | skb->nh.raw = skb->data; | |
14 | memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); |