projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d79f16c
)
ipip: ioctl: Remove superfluous IP-TTL handling.
author
Pravin B Shelar
<pshelar@nicira.com>
Fri, 18 Dec 2015 00:46:39 +0000
(16:46 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 18 Dec 2015 21:07:59 +0000
(16:07 -0500)
IP-TTL case is already handled in ip_tunnel_ioctl() API.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipip.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv4/ipip.c
b/net/ipv4/ipip.c
index f34c31defafe083fcc9146affff5c39745150d04..a09fb0dec725a8827ba5d1e928597c103d1f9322 100644
(file)
--- a/
net/ipv4/ipip.c
+++ b/
net/ipv4/ipip.c
@@
-253,9
+253,6
@@
ipip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
p.i_key = p.o_key = 0;
p.i_flags = p.o_flags = 0;
- if (p.iph.ttl)
- p.iph.frag_off |= htons(IP_DF);
-
err = ip_tunnel_ioctl(dev, &p, cmd);
if (err)
return err;