diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-10 23:03:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-10 23:03:26 -0700 |
| commit | d250fe91ae129bff0968e685cc9c466d3a5e3482 (patch) | |
| tree | e38b7628a5c6afb80c22341759f392585e558cb1 /net/ipv6/xfrm6_input.c | |
| parent | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (diff) | |
| parent | b56f2d55c6c22b0c5774b3b22e336fb6cc5f4094 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/xfrm6_input.c')
| -rw-r--r-- | net/ipv6/xfrm6_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c index 2bc98ede123..f8c3cf842f5 100644 --- a/net/ipv6/xfrm6_input.c +++ b/net/ipv6/xfrm6_input.c @@ -42,7 +42,7 @@ 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_INET_PRE_ROUTING, skb, skb->dev, NULL, + NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, skb, skb->dev, NULL, ip6_rcv_finish); return -1; } |