aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/output_core.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 16:48:39 -0500
committerDavid S. Miller <davem@davemloft.net>2015-10-08 04:26:58 -0700
commit9f8955cc468ddb7d08a0e614a45f9a82c4019b00 (patch)
tree52c4d3eeb3a0744d92c8bffe87c6bc9615fe3a7e /net/ipv6/output_core.c
parente2cb77db089796f163092326ca25512845df7a3a (diff)
downloadlinux-stericsson-9f8955cc468ddb7d08a0e614a45f9a82c4019b00.tar.gz
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>
Diffstat (limited to 'net/ipv6/output_core.c')
-rw-r--r--net/ipv6/output_core.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index e5affb5fe095..f93ae1515387 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)
EXPORT_SYMBOL(ip6_dst_hoplimit);
#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);
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,
dst_output);
}
-
-int __ip6_local_out(struct sk_buff *skb)
-{
- return __ip6_local_out_sk(skb->sk, skb);
-}
EXPORT_SYMBOL_GPL(__ip6_local_out);
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);
int err;
- err = __ip6_local_out_sk(sk, skb);
+ err = __ip6_local_out(sk, skb);
if (likely(err == 1))
err = dst_output(net, sk, skb);