| commit | 13206b6bff3b15b724926a222406476bf2c23c40 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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>
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index cfcb996..fc42525 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c
@@ -1689,7 +1689,7 @@ if (unlikely(opt->optlen)) ip_forward_options(skb); - return dst_output(sk, skb); + return dst_output(net, sk, skb); } /*