diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:47 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-08 04:27:03 -0700 |
| commit | ede2059dbaf9c6557a49d466c8c7778343b208ff (patch) | |
| tree | d6d15cbeb675b52ef22890a2228b5301b1396c45 /net/ipv6/ip6_output.c | |
| parent | ipv4, ipv6: Pass net into ip_local_out and ip6_local_out (diff) | |
| download | linux-dev-ede2059dbaf9c6557a49d466c8c7778343b208ff.tar.xz linux-dev-ede2059dbaf9c6557a49d466c8c7778343b208ff.zip | |
dst: Pass net into dst->output
The network namespace is already passed into dst_output pass it into
dst->output lwt->output and friends.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 98510fac94e9..32583b507c2e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -130,11 +130,10 @@ static int ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *s return ip6_finish_output2(net, sk, skb); } -int ip6_output(struct sock *sk, struct sk_buff *skb) +int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) { struct net_device *dev = skb_dst(skb)->dev; struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); - struct net *net = dev_net(dev); if (unlikely(idev->cnf.disable_ipv6)) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); |