[NETFILTER]: Introduce NF_INET_ hook values

[deliverable/linux.git] / net / ipv6 / xfrm6_input.c

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 5c006c8459438329fa2ef5f337d06adc1607a103..e2c3efd2579d65a9a2cfc75fba5545286a7e733b 100644 (file)
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -37,10 +37,13 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async)
        ipv6_hdr(skb)->payload_len = htons(skb->len);
        __skb_push(skb, skb->data - skb_network_header(skb));
 
-       NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL,
+       NF_HOOK(PF_INET6, NF_INET_PRE_ROUTING, skb, skb->dev, NULL,
                ip6_rcv_finish);
        return -1;
 #else
+       if (async)
+               return ip6_rcv_finish(skb);
+
        return 1;
 #endif
 }