diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2015-12-18 01:46:39 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-18 22:07:59 +0100 |
commit | 6d3c348a63685410b12bf961b97063efeef2f901 (patch) | |
tree | e241b5c72d881ef6b911c1cc03f551e6ede2a29a /net | |
parent | mkiss: Fix use after free in mkiss_close(). (diff) | |
download | linux-6d3c348a63685410b12bf961b97063efeef2f901.tar.xz linux-6d3c348a63685410b12bf961b97063efeef2f901.zip |
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>
Diffstat (limited to '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) 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; |