summaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.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/route.c
parente2cb77db089796f163092326ca25512845df7a3a (diff)
downloadlinux-9f8955cc468ddb7d08a0e614a45f9a82c4019b00.tar.gz
linux-9f8955cc468ddb7d08a0e614a45f9a82c4019b00.tar.bz2
linux-9f8955cc468ddb7d08a0e614a45f9a82c4019b00.zip
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/route.c')
-rw-r--r--net/ipv6/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b62a507cc1a5..d3d946773a3e 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -226,7 +226,7 @@ static struct dst_ops ip6_dst_ops_template = {
.link_failure = ip6_link_failure,
.update_pmtu = ip6_rt_update_pmtu,
.redirect = rt6_do_redirect,
- .local_out = __ip6_local_out_sk,
+ .local_out = __ip6_local_out,
.neigh_lookup = ip6_neigh_lookup,
};