netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] gre: Fix MTU calculation for bound GRE tunnels
@ 2009-08-14 18:37 Tom Goff
  2009-08-14 23:34 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Tom Goff @ 2009-08-14 18:37 UTC (permalink / raw)
  To: netdev

The GRE header length should be subtracted when the tunnel MTU is
calculated.  This just corrects for the associativity change
introduced by commit 42aa916265d740d66ac1f17290366e9494c884c2.

Signed-off-by: Tom Goff <thomas.goff@boeing.com>
---
 net/ipv4/ip_gre.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index cb4a0f4..82c11dd 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -951,7 +951,7 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev)
 			addend += 4;
 	}
 	dev->needed_headroom = addend + hlen;
-	mtu -= dev->hard_header_len - addend;
+	mtu -= dev->hard_header_len + addend;
 
 	if (mtu < 68)
 		mtu = 68;
-- 
1.6.0.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] gre: Fix MTU calculation for bound GRE tunnels
  2009-08-14 18:37 [PATCH] gre: Fix MTU calculation for bound GRE tunnels Tom Goff
@ 2009-08-14 23:34 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-08-14 23:34 UTC (permalink / raw)
  To: thomas.goff; +Cc: netdev

From: Tom Goff <thomas.goff@boeing.com>
Date: Fri, 14 Aug 2009 11:37:58 -0700

> The GRE header length should be subtracted when the tunnel MTU is
> calculated.  This just corrects for the associativity change
> introduced by commit 42aa916265d740d66ac1f17290366e9494c884c2.
> 
> Signed-off-by: Tom Goff <thomas.goff@boeing.com>

Thanks for finding and fixing this bug, applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-08-14 23:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-14 18:37 [PATCH] gre: Fix MTU calculation for bound GRE tunnels Tom Goff
2009-08-14 23:34 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).