aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 17:48:36 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-08 07:26:55 -0400
commit4ebdfba73c09d8568d891bae87c40fad43dd7f41 (patch)
treef90cbfbed25de48ec9972d9b294cdcd856f05a12 /net/ipv6
parent13206b6bff3b15b724926a222406476bf2c23c40 (diff)
dst: Pass a sk into .local_out
For consistency with the other similar methods in the kernel pass a struct sock into the dst_ops .local_out method. Simplifying the socket passing case is needed a prequel to passing a struct net reference into .local_out. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/output_core.c2
-rw-r--r--net/ipv6/route.c2
-rw-r--r--net/ipv6/xfrm6_policy.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 4337147ee23d..e5affb5fe095 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -138,7 +138,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
138EXPORT_SYMBOL(ip6_dst_hoplimit); 138EXPORT_SYMBOL(ip6_dst_hoplimit);
139#endif 139#endif
140 140
141static int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) 141int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
142{ 142{
143 struct net *net = dev_net(skb_dst(skb)->dev); 143 struct net *net = dev_net(skb_dst(skb)->dev);
144 int len; 144 int len;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d3d946773a3e..b62a507cc1a5 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -226,7 +226,7 @@ static struct dst_ops ip6_dst_ops_template = {
226 .link_failure = ip6_link_failure, 226 .link_failure = ip6_link_failure,
227 .update_pmtu = ip6_rt_update_pmtu, 227 .update_pmtu = ip6_rt_update_pmtu,
228 .redirect = rt6_do_redirect, 228 .redirect = rt6_do_redirect,
229 .local_out = __ip6_local_out, 229 .local_out = __ip6_local_out_sk,
230 .neigh_lookup = ip6_neigh_lookup, 230 .neigh_lookup = ip6_neigh_lookup,
231}; 231};
232 232
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 08c9c93f3527..f7876830f263 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -285,7 +285,7 @@ static struct dst_ops xfrm6_dst_ops = {
285 .cow_metrics = dst_cow_metrics_generic, 285 .cow_metrics = dst_cow_metrics_generic,
286 .destroy = xfrm6_dst_destroy, 286 .destroy = xfrm6_dst_destroy,
287 .ifdown = xfrm6_dst_ifdown, 287 .ifdown = xfrm6_dst_ifdown,
288 .local_out = __ip6_local_out, 288 .local_out = __ip6_local_out_sk,
289 .gc_thresh = 32768, 289 .gc_thresh = 32768,
290}; 290};
291 291