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/netfilter | |
parent | 9f8955cc468ddb7d08a0e614a45f9a82c4019b00 (diff) | |
download | linux-stable-792883303cdb3a7edd16017d7aba53926189ef41.tar.gz linux-stable-792883303cdb3a7edd16017d7aba53926189ef41.tar.bz2 linux-stable-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/netfilter')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_xmit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index d77503e635d8..2042b9303136 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c @@ -1141,7 +1141,7 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, ret = ip_vs_tunnel_xmit_prepare(skb, cp); if (ret == NF_ACCEPT) - ip6_local_out(skb); + ip6_local_out(skb->sk, skb); else if (ret == NF_DROP) kfree_skb(skb); rcu_read_unlock(); |