aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index dabf108ad811..4535b7a0169b 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -66,8 +66,8 @@ int __ip6_local_out(struct sk_buff *skb)
66 len = 0; 66 len = 0;
67 ipv6_hdr(skb)->payload_len = htons(len); 67 ipv6_hdr(skb)->payload_len = htons(len);
68 68
69 return nf_hook(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb_dst(skb)->dev, 69 return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,
70 dst_output); 70 skb_dst(skb)->dev, dst_output);
71} 71}
72 72
73int ip6_local_out(struct sk_buff *skb) 73int ip6_local_out(struct sk_buff *skb)
@@ -134,8 +134,8 @@ static int ip6_output2(struct sk_buff *skb)
134 is not supported in any case. 134 is not supported in any case.
135 */ 135 */
136 if (newskb) 136 if (newskb)
137 NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, newskb, 137 NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING,
138 NULL, newskb->dev, 138 newskb, NULL, newskb->dev,
139 ip6_dev_loopback_xmit); 139 ip6_dev_loopback_xmit);
140 140
141 if (ipv6_hdr(skb)->hop_limit == 0) { 141 if (ipv6_hdr(skb)->hop_limit == 0) {
@@ -150,7 +150,7 @@ static int ip6_output2(struct sk_buff *skb)
150 skb->len); 150 skb->len);
151 } 151 }
152 152
153 return NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, skb, NULL, skb->dev, 153 return NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, skb->dev,
154 ip6_output_finish); 154 ip6_output_finish);
155} 155}
156 156
@@ -260,8 +260,8 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
260 if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) { 260 if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) {
261 IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)), 261 IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)),
262 IPSTATS_MIB_OUT, skb->len); 262 IPSTATS_MIB_OUT, skb->len);
263 return NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, 263 return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,
264 dst_output); 264 dst->dev, dst_output);
265 } 265 }
266 266
267 if (net_ratelimit()) 267 if (net_ratelimit())
@@ -537,7 +537,7 @@ int ip6_forward(struct sk_buff *skb)
537 hdr->hop_limit--; 537 hdr->hop_limit--;
538 538
539 IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS); 539 IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);
540 return NF_HOOK(PF_INET6, NF_INET_FORWARD, skb, skb->dev, dst->dev, 540 return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dst->dev,
541 ip6_forward_finish); 541 ip6_forward_finish);
542 542
543error: 543error: