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 /include/net | |
| 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 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 56920262dbe9..be7e7689514b 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -865,8 +865,7 @@ int ip6_forward(struct sk_buff *skb); int ip6_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 sk_buff *skb); +int __ip6_local_out(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); |