p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv6: Merge __ip6_local_out and __ip6_local_out_sk 

Only __ip6_local_out_sk has callers so rename __ip6_local_out_sk
__ip6_local_out and remove the previous __ip6_local_out.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2015-10-07 16:48:39 -05:00 committed by David S. Miller
parent e2cb77db08
commit 9f8955cc46
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/ipv6.h
View File

@ -865,8 +865,7 @@ int ip6_forward(struct sk_buff *skb);
int ip6_input(struct sk_buff *skb); int ip6_input(struct sk_buff *skb);
int ip6_mc_input(struct sk_buff *skb); int ip6_mc_input(struct sk_buff *skb);
int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb); int __ip6_local_out(struct sock *sk, struct sk_buff *skb);
int __ip6_local_out(struct sk_buff *skb);
int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb); int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);
int ip6_local_out(struct sk_buff *skb); int ip6_local_out(struct sk_buff *skb);

9
net/ipv6/output_core.c
View File

@ -138,7 +138,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
EXPORT_SYMBOL(ip6_dst_hoplimit); EXPORT_SYMBOL(ip6_dst_hoplimit);
#endif #endif
int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) int __ip6_local_out(struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
int len; int len;
@ -153,11 +153,6 @@ int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
net, sk, skb, NULL, skb_dst(skb)->dev, net, sk, skb, NULL, skb_dst(skb)->dev,
dst_output); dst_output);
} }
int __ip6_local_out(struct sk_buff *skb)
{
return __ip6_local_out_sk(skb->sk, skb);
}
EXPORT_SYMBOL_GPL(__ip6_local_out); EXPORT_SYMBOL_GPL(__ip6_local_out);
int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
@ -165,7 +160,7 @@ int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
int err; int err;
err = __ip6_local_out_sk(sk, skb); err = __ip6_local_out(sk, skb);
if (likely(err == 1)) if (likely(err == 1))
err = dst_output(net, sk, skb); err = dst_output(net, sk, skb);

2
net/ipv6/route.c
View File

@ -226,7 +226,7 @@ static struct dst_ops ip6_dst_ops_template = {
.link_failure = ip6_link_failure, .link_failure = ip6_link_failure,
.update_pmtu = ip6_rt_update_pmtu, .update_pmtu = ip6_rt_update_pmtu,
.redirect = rt6_do_redirect, .redirect = rt6_do_redirect,
.local_out = __ip6_local_out_sk, .local_out = __ip6_local_out,
.neigh_lookup = ip6_neigh_lookup, .neigh_lookup = ip6_neigh_lookup,
}; };

2
net/ipv6/xfrm6_policy.c
View File

@ -285,7 +285,7 @@ static struct dst_ops xfrm6_dst_ops = {
.cow_metrics = dst_cow_metrics_generic, .cow_metrics = dst_cow_metrics_generic,
.destroy = xfrm6_dst_destroy, .destroy = xfrm6_dst_destroy,
.ifdown = xfrm6_dst_ifdown, .ifdown = xfrm6_dst_ifdown,
.local_out = __ip6_local_out_sk, .local_out = __ip6_local_out,
.gc_thresh = 32768, .gc_thresh = 32768,
}; };