commit 13206b6bff3b15b724926a222406476bf2c23c40
author Eric W. Biederman <ebiederm@xmission.com> Wed Oct 07 16:48:35 2015 -0500
committer David S. Miller <davem@davemloft.net> Thu Oct 08 04:26:54 2015 -0700
tree 4d433aa937254f44d86411cd33355072b56925ab
parent 3f5312ae620c79e877a6aa0e8894c6603a090b4e

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>

net/ipv6/ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 5e5d16e..ad19136 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1991,7 +1991,7 @@
 			 IPSTATS_MIB_OUTFORWDATAGRAMS);
 	IP6_ADD_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),
 			 IPSTATS_MIB_OUTOCTETS, skb->len);
-	return dst_output(sk, skb);
+	return dst_output(net, sk, skb);
 }
 
 /*