Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / net / ipv4 / xfrm4_input.c

diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 289146bdb8b07ef906f11482e85844bbe34fd320..78e80deb7e89a25780d74a7e1691b73bb7e06b53 100644 (file)
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -27,6 +27,7 @@ static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32
 {
        switch (nexthdr) {
        case IPPROTO_IPIP:
+       case IPPROTO_IPV6:
                *spi = skb->nh.iph->saddr;
                *seq = 0;
                return 0;
@@ -70,7 +71,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
                if (xfrm_nr == XFRM_MAX_DEPTH)
                        goto drop;
 
-               x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, iph->protocol, AF_INET);
+               x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi,
+                               iph->protocol != IPPROTO_IPV6 ? iph->protocol : IPPROTO_IPIP, AF_INET);
                if (x == NULL)
                        goto drop;