Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-31 18:20:10 -05:00
parent 7b22a7788b 9c982e86db
commit c07f30ad68
265 changed files with 2586 additions and 1267 deletions
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -252,9 +252,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;