projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: Pass net into dst_output and remove dst_output_okfn
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
ip_vti.c
diff --git
a/net/ipv4/ip_vti.c
b/net/ipv4/ip_vti.c
index 3b87ec5178f986ad17f53d23fcd8e01402fe13a4..4d8f0b6987777ab6c096fadbce538c53cbcad24b 100644
(file)
--- 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);