diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-16 03:04:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-18 02:18:36 +0200 |
| commit | 19a0644ca31c7e22abdb4058ea013f1f7abf7327 (patch) | |
| tree | d3846d6f7bedd6299b39dfe54b9631902c8f7c9a /net/ipv6 | |
| parent | ipv6: Only compute net once in ip6_finish_output2 (diff) | |
| download | linux-19a0644ca31c7e22abdb4058ea013f1f7abf7327.tar.xz linux-19a0644ca31c7e22abdb4058ea013f1f7abf7327.zip | |
ipv6: Cache net in ip6_output
Keep net in a local variable so I can use it in NF_HOOK_COND
when I pass struct net to all of the netfilter hooks.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -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 12d0166a64cd..8cab909b181e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -135,9 +135,9 @@ int ip6_output(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(dev_net(dev), idev, - IPSTATS_MIB_OUTDISCARDS); + IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); kfree_skb(skb); return 0; } |