summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/xfrm4_output.c1
-rw-r--r--net/ipv6/ip6_output.c1
-rw-r--r--net/ipv6/xfrm6_output.c1
-rw-r--r--net/xfrm/xfrm_output.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
index 28ae2048b93a..cd6be736e19f 100644
--- a/net/ipv4/xfrm4_output.c
+++ b/net/ipv4/xfrm4_output.c
@@ -97,6 +97,7 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)
97int xfrm4_output(struct sock *sk, struct sk_buff *skb) 97int xfrm4_output(struct sock *sk, struct sk_buff *skb)
98{ 98{
99 struct net *net = dev_net(skb_dst(skb)->dev); 99 struct net *net = dev_net(skb_dst(skb)->dev);
100
100 return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, 101 return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,
101 net, sk, skb, NULL, skb_dst(skb)->dev, 102 net, sk, skb, NULL, skb_dst(skb)->dev,
102 __xfrm4_output, 103 __xfrm4_output,
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d8d68e81d123..291a07be5dfb 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -136,6 +136,7 @@ int ip6_output(struct sock *sk, struct sk_buff *skb)
136 struct net_device *dev = skb_dst(skb)->dev; 136 struct net_device *dev = skb_dst(skb)->dev;
137 struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); 137 struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
138 struct net *net = dev_net(dev); 138 struct net *net = dev_net(dev);
139
139 if (unlikely(idev->cnf.disable_ipv6)) { 140 if (unlikely(idev->cnf.disable_ipv6)) {
140 IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); 141 IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
141 kfree_skb(skb); 142 kfree_skb(skb);
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 68a996f8a044..0c3e9ffcf231 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -169,6 +169,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
169int xfrm6_output(struct sock *sk, struct sk_buff *skb) 169int xfrm6_output(struct sock *sk, struct sk_buff *skb)
170{ 170{
171 struct net *net = dev_net(skb_dst(skb)->dev); 171 struct net *net = dev_net(skb_dst(skb)->dev);
172
172 return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, 173 return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,
173 net, sk, skb, NULL, skb_dst(skb)->dev, 174 net, sk, skb, NULL, skb_dst(skb)->dev,
174 __xfrm6_output, 175 __xfrm6_output,
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 61ba99f61dc8..c48a4b8582bb 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -132,6 +132,7 @@ out:
132int xfrm_output_resume(struct sk_buff *skb, int err) 132int xfrm_output_resume(struct sk_buff *skb, int err)
133{ 133{
134 struct net *net = xs_net(skb_dst(skb)->xfrm); 134 struct net *net = xs_net(skb_dst(skb)->xfrm);
135
135 while (likely((err = xfrm_output_one(skb, err)) == 0)) { 136 while (likely((err = xfrm_output_one(skb, err)) == 0)) {
136 nf_reset(skb); 137 nf_reset(skb);
137 138