diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:54 -0700 |
commit | 13206b6bff3b15b724926a222406476bf2c23c40 (patch) | |
tree | 4d433aa937254f44d86411cd33355072b56925ab /net/ipv6/xfrm6_output.c | |
parent | 3f5312ae620c79e877a6aa0e8894c6603a090b4e (diff) | |
download | linux-13206b6bff3b15b724926a222406476bf2c23c40.tar.bz2 |
net: Pass net into dst_output and remove dst_output_okfn
Replace dst_output_okfn with dst_output
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
-rw-r--r-- | net/ipv6/xfrm6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 4cefda009f53..c9a5bd5fea9c 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -147,7 +147,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) #ifdef CONFIG_NETFILTER if (!x) { IP6CB(skb)->flags |= IP6SKB_REROUTED; - return dst_output(sk, skb); + return dst_output(net, sk, skb); } #endif |