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
Merge branch 'fix/asoc' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
ipip.c
diff --git
a/net/ipv4/ipip.c
b/net/ipv4/ipip.c
index e9b816e6cd73a681ea02e9540d6849eb924f4a8a..cd300aaee78f542630f40ab9a34f9b10af8eec9e 100644
(file)
--- a/
net/ipv4/ipip.c
+++ b/
net/ipv4/ipip.c
@@
-676,6
+676,7
@@
ipip_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
}
t = netdev_priv(dev);
ipip_tunnel_unlink(ipn, t);
+ synchronize_net();
t->parms.iph.saddr = p.iph.saddr;
t->parms.iph.daddr = p.iph.daddr;
memcpy(dev->dev_addr, &p.iph.saddr, 4);