diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2015-12-17 19:46:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-18 16:07:59 -0500 |
commit | 6d3c348a63685410b12bf961b97063efeef2f901 (patch) | |
tree | e241b5c72d881ef6b911c1cc03f551e6ede2a29a | |
parent | d79f16c046086f4fe0d42184a458e187464eb83e (diff) |
ipip: ioctl: Remove superfluous IP-TTL handling.
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>
-rw-r--r-- | net/ipv4/ipip.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index f34c31defafe..a09fb0dec725 100644 --- 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) | |||
253 | 253 | ||
254 | p.i_key = p.o_key = 0; | 254 | p.i_key = p.o_key = 0; |
255 | p.i_flags = p.o_flags = 0; | 255 | p.i_flags = p.o_flags = 0; |
256 | if (p.iph.ttl) | ||
257 | p.iph.frag_off |= htons(IP_DF); | ||
258 | |||
259 | err = ip_tunnel_ioctl(dev, &p, cmd); | 256 | err = ip_tunnel_ioctl(dev, &p, cmd); |
260 | if (err) | 257 | if (err) |
261 | return err; | 258 | return err; |