| From 40c8613fe3e601d957d820c3fa4b759fc285939f Mon Sep 17 00:00:00 2001 |
| From: Tom Goff <thomas.goff@boeing.com> |
| Date: Fri, 14 Aug 2009 16:33:56 -0700 |
| Subject: gre: Fix MTU calculation for bound GRE tunnels |
| |
| 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; |
