summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_vti.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 16:48:35 -0500
committerDavid S. Miller <davem@davemloft.net>2015-10-08 04:26:54 -0700
commit13206b6bff3b15b724926a222406476bf2c23c40 (patch)
tree4d433aa937254f44d86411cd33355072b56925ab /net/ipv4/ip_vti.c
parent3f5312ae620c79e877a6aa0e8894c6603a090b4e (diff)
downloadlinux-13206b6bff3b15b724926a222406476bf2c23c40.tar.gz
linux-13206b6bff3b15b724926a222406476bf2c23c40.tar.bz2
linux-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/ip_vti.c')
-rw-r--r--net/ipv4/ip_vti.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 3b87ec5178f9..4d8f0b698777 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -197,7 +197,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
skb_dst_set(skb, dst);
skb->dev = skb_dst(skb)->dev;
- err = dst_output(skb->sk, skb);
+ err = dst_output(tunnel->net, skb->sk, skb);
if (net_xmit_eval(err) == 0)
err = skb->len;
iptunnel_xmit_stats(err, &dev->stats, dev->tstats);