diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-08 00:48:35 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-08 14:26:54 +0300 |
commit | 13206b6bff3b15b724926a222406476bf2c23c40 (patch) | |
tree | 4d433aa937254f44d86411cd33355072b56925ab /net/ipv6/output_core.c | |
parent | 3f5312ae620c79e877a6aa0e8894c6603a090b4e (diff) | |
download | linux-13206b6bff3b15b724926a222406476bf2c23c40.tar.xz |
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/output_core.c')
-rw-r--r-- | net/ipv6/output_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index e77102c4f804..4337147ee23d 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c @@ -151,7 +151,7 @@ static int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, sk, skb, NULL, skb_dst(skb)->dev, - dst_output_okfn); + dst_output); } int __ip6_local_out(struct sk_buff *skb) @@ -162,11 +162,12 @@ EXPORT_SYMBOL_GPL(__ip6_local_out); int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb) { + struct net *net = dev_net(skb_dst(skb)->dev); int err; err = __ip6_local_out_sk(sk, skb); if (likely(err == 1)) - err = dst_output(sk, skb); + err = dst_output(net, sk, skb); return err; } |