Messages in this thread Patch in this message | | | Date | Thu, 10 Sep 2009 17:22:49 -0700 | From | Greg KH <> | Subject | [patch 03/22] gre: Fix MTU calculation for bound GRE tunnels |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------ From: Tom Goff <thomas.goff@boeing.com>
[ Upstream commit 8cdb045632e5ee22854538619ac6f150eb0a4894 ]
The GRE header length should be subtracted when the tunnel MTU is calculated. This just corrects for the associativity change introduced by commit 42aa916265d740d66ac1f17290366e9494c884c2 ("gre: Move MTU setting out of ipgre_tunnel_bind_dev").
Signed-off-by: Tom Goff <thomas.goff@boeing.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/ipv4/ip_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -952,7 +952,7 @@ static int ipgre_tunnel_bind_dev(struct addend += 4; } dev->needed_headroom = addend + hlen; - mtu -= dev->hard_header_len - addend; + mtu -= dev->hard_header_len + addend; if (mtu < 68) mtu = 68;
| |