diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:58 -0700 |
| commit | 792883303cdb3a7edd16017d7aba53926189ef41 (patch) | |
| tree | 6f55c849c97bb97fed30b4ca92c709cd4e5fe96f /net/ipv6/output_core.c | |
| parent | 9f8955cc468ddb7d08a0e614a45f9a82c4019b00 (diff) | |
| download | linux-792883303cdb3a7edd16017d7aba53926189ef41.tar.gz linux-792883303cdb3a7edd16017d7aba53926189ef41.tar.bz2 linux-792883303cdb3a7edd16017d7aba53926189ef41.zip | |
ipv6: Merge ip6_local_out and ip6_local_out_sk
Stop hidding the sk parameter with an inline helper function and make
all of the callers pass it, so that it is clear what the function is
doing.
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.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index f93ae1515387..12855811c6a0 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c @@ -155,7 +155,7 @@ int __ip6_local_out(struct sock *sk, struct sk_buff *skb) } EXPORT_SYMBOL_GPL(__ip6_local_out); -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 err; @@ -166,10 +166,4 @@ int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) return err; } -EXPORT_SYMBOL_GPL(ip6_local_out_sk); - -int ip6_local_out(struct sk_buff *skb) -{ - return ip6_local_out_sk(skb->sk, skb); -} EXPORT_SYMBOL_GPL(ip6_local_out); |