diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-16 04:03:53 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-18 03:18:32 +0300 |
| commit | 5a70649e0dae02ba5090540fffce667d2300bc5a (patch) | |
| tree | 38e18ea126c7665eebaf3ff3231a43522929a115 /net/ipv4/xfrm4_output.c | |
| parent | a6568b2425daffc7b21ae63b6601b57ae14b5cb8 (diff) | |
| download | linux-5a70649e0dae02ba5090540fffce667d2300bc5a.tar.xz | |
net: Merge dst_output and dst_output_sk
Add a sock paramter to dst_output making dst_output_sk superfluous.
Add a skb->sk parameter to all of the callers of dst_output
Have the callers of dst_output_sk call dst_output.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index 2878dbfffeb7..737f5e395a6a 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -87,7 +87,7 @@ static int __xfrm4_output(struct sock *sk, struct sk_buff *skb) #ifdef CONFIG_NETFILTER if (!x) { IPCB(skb)->flags |= IPSKB_REROUTED; - return dst_output_sk(sk, skb); + return dst_output(sk, skb); } #endif |