diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-11 02:03:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 02:03:26 -0400 |
| commit | d250fe91ae129bff0968e685cc9c466d3a5e3482 (patch) | |
| tree | e38b7628a5c6afb80c22341759f392585e558cb1 /net/ipv6/ip6mr.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/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 3e333268db89..e0b530ca394c 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -1570,7 +1570,7 @@ static int ip6mr_forward2(struct sk_buff *skb, struct mfc6_cache *c, int vifi) | |||
| 1570 | 1570 | ||
| 1571 | IP6CB(skb)->flags |= IP6SKB_FORWARDED; | 1571 | IP6CB(skb)->flags |= IP6SKB_FORWARDED; |
| 1572 | 1572 | ||
| 1573 | return NF_HOOK(PF_INET6, NF_INET_FORWARD, skb, skb->dev, dev, | 1573 | return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dev, |
| 1574 | ip6mr_forward2_finish); | 1574 | ip6mr_forward2_finish); |
| 1575 | 1575 | ||
| 1576 | out_free: | 1576 | out_free: |