diff options
| author | Eric W. Biederman | 2015-10-07 23:48:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-10-08 13:26:54 +0200 |
| commit | 13206b6bff3b15b724926a222406476bf2c23c40 (patch) | |
| tree | 4d433aa937254f44d86411cd33355072b56925ab /net/ipv6/ip6_output.c | |
| parent | xfrm: Only compute net once in xfrm_policy_queue_process (diff) | |
| download | kernel-qcow2-linux-13206b6bff3b15b724926a222406476bf2c23c40.tar.gz kernel-qcow2-linux-13206b6bff3b15b724926a222406476bf2c23c40.tar.xz kernel-qcow2-linux-13206b6bff3b15b724926a222406476bf2c23c40.zip | |
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/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index caf7d14a1bdd..0171e762e03c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -233,7 +233,7 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, */ return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, (struct sock *)sk, skb, NULL, dst->dev, - dst_output_okfn); + dst_output); } skb->dev = dst->dev; @@ -333,7 +333,7 @@ static inline int ip6_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { skb_sender_cpu_clear(skb); - return dst_output(sk, skb); + return dst_output(net, sk, skb); } static unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst) |