diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:35 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:54 -0700 |
| commit | 13206b6bff3b15b724926a222406476bf2c23c40 (patch) | |
| tree | 4d433aa937254f44d86411cd33355072b56925ab /net/ipv4/ipmr.c | |
| parent | xfrm: Only compute net once in xfrm_policy_queue_process (diff) | |
| download | linux-dev-13206b6bff3b15b724926a222406476bf2c23c40.tar.xz linux-dev-13206b6bff3b15b724926a222406476bf2c23c40.zip | |
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>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index cfcb996ec51b..fc42525d8694 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1689,7 +1689,7 @@ static inline int ipmr_forward_finish(struct net *net, struct sock *sk, if (unlikely(opt->optlen)) ip_forward_options(skb); - return dst_output(sk, skb); + return dst_output(net, sk, skb); } /* |