diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 23:48:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 13:26:58 +0200 |
| commit | 9f8955cc468ddb7d08a0e614a45f9a82c4019b00 (patch) | |
| tree | 52c4d3eeb3a0744d92c8bffe87c6bc9615fe3a7e /net/ipv6/xfrm6_policy.c | |
| parent | ipv4: Merge ip_local_out and ip_local_out_sk (diff) | |
| download | linux-9f8955cc468ddb7d08a0e614a45f9a82c4019b00.tar.xz 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 '')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index f7876830f263..08c9c93f3527 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -285,7 +285,7 @@ static struct dst_ops xfrm6_dst_ops = { .cow_metrics = dst_cow_metrics_generic, .destroy = xfrm6_dst_destroy, .ifdown = xfrm6_dst_ifdown, - .local_out = __ip6_local_out_sk, + .local_out = __ip6_local_out, .gc_thresh = 32768, }; |