diff options
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index da0a4d2adc69..0abdc242ddb7 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -536,7 +536,7 @@ void ndisc_send_skb(struct sk_buff *skb, | |||
536 | idev = in6_dev_get(dst->dev); | 536 | idev = in6_dev_get(dst->dev); |
537 | IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); | 537 | IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); |
538 | 538 | ||
539 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, | 539 | err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, |
540 | dst_output); | 540 | dst_output); |
541 | if (!err) { | 541 | if (!err) { |
542 | ICMP6MSGOUT_INC_STATS(net, idev, type); | 542 | ICMP6MSGOUT_INC_STATS(net, idev, type); |
@@ -890,8 +890,6 @@ out: | |||
890 | in6_ifa_put(ifp); | 890 | in6_ifa_put(ifp); |
891 | else | 891 | else |
892 | in6_dev_put(idev); | 892 | in6_dev_put(idev); |
893 | |||
894 | return; | ||
895 | } | 893 | } |
896 | 894 | ||
897 | static void ndisc_recv_na(struct sk_buff *skb) | 895 | static void ndisc_recv_na(struct sk_buff *skb) |
@@ -1618,7 +1616,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1618 | skb_dst_set(buff, dst); | 1616 | skb_dst_set(buff, dst); |
1619 | idev = in6_dev_get(dst->dev); | 1617 | idev = in6_dev_get(dst->dev); |
1620 | IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); | 1618 | IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); |
1621 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev, | 1619 | err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev, |
1622 | dst_output); | 1620 | dst_output); |
1623 | if (!err) { | 1621 | if (!err) { |
1624 | ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT); | 1622 | ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT); |