Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a0644c authored Sep 15, 2015 by Eric W. Biederman Committed by David S. Miller Sep 17, 2015

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>

parent 78126c41

net/ipv6/ip6_output.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}