diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-11 08:03:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 08:03:26 +0200 |
| commit | d250fe91ae129bff0968e685cc9c466d3a5e3482 (patch) | |
| tree | e38b7628a5c6afb80c22341759f392585e558cb1 /net/ipv6/raw.c | |
| parent | net: trans_start cleanups (diff) | |
| parent | netfilter: use rcu_dereference_protected() (diff) | |
| download | linux-d250fe91ae129bff0968e685cc9c466d3a5e3482.tar.xz linux-d250fe91ae129bff0968e685cc9c466d3a5e3482.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 0e3d2dd92078..4a4dcbe4f8b2 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -640,8 +640,8 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, goto error_fault; IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len); - err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev, - dst_output); + err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, + rt->u.dst.dev, dst_output); if (err > 0) err = net_xmit_errno(err); if (err) |