| Message ID | 566301B7.3050506@shemyak.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Konstantin Shemyak <konstantin@shemyak.com> Date: Sat, 5 Dec 2015 17:24:39 +0200 > On 01.12.2015 19:08, David Miller wrote: >> From: Hannes Frederic Sowa <hannes@stressinduktion.org> >> Date: Tue, 01 Dec 2015 14:30:55 +0100 >> >>> On Tue, Dec 1, 2015, at 14:20, Konstantin Shemyak wrote: >>>> My point was not to question its feasibility, but to make it similar >>>> across GRE, IP-IP and SIT tunnels. >>> >>> I would send a patch to add it again if Parvin didn't have good >>> reasons >>> to remove it. >> >> The tunnel code consolidation created a lot of regressions and subtle >> unintended changes in behavior between the different tunnel types. >> >> This DF bit issue is just yet another example of that. > > The patch is rather trivial; attached. No signoff, so I can't apply this. Also patches should be submitted as fresh mailing list postings, with the patch inline rather than as an attachment. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From b8a901a0d970907a2dc162744536b1ef07e5d45a Mon Sep 17 00:00:00 2001 From: Konstantin Shemyak <konstantin@shemyak.com> Date: Sat, 5 Dec 2015 17:15:55 +0200 Subject: [PATCH] Set DF bit to GRE tunnels with fixed TTL, similarly to IP-IP and SIT The DF bit on IPv4 tunnels with fixed TTL is enforced in order to prevent networking loops. This was the original behavior of GRE tunnels, lost in the refactoring. --- net/ipv4/ip_gre.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 6145214..485bf27 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -679,6 +679,10 @@ static int ipgre_tunnel_ioctl(struct net_device *dev, ((p.i_flags|p.o_flags)&(GRE_VERSION|GRE_ROUTING))) return -EINVAL; } + + if (p.iph.ttl) + p.iph.frag_off |= htons(IP_DF); + p.i_flags = gre_flags_to_tnl_flags(p.i_flags); p.o_flags = gre_flags_to_tnl_flags(p.o_flags); -- 1.9.1