From: Pravin B Shelar <pshelar@nicira.com>
Date: Fri, 18 Dec 2015 00:46:39 +0000 (-0800)
Subject: ipip: ioctl: Remove superfluous IP-TTL handling.
X-Git-Tag: firefly_0821_release~176^2~505^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d3c348a63685410b12bf961b97063efeef2f901;p=firefly-linux-kernel-4.4.55.git

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>
---

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)
 
 	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;