From 5ca3b012e595984abbb12a3ea99c84ea5a5f7385 Mon Sep 17 00:00:00 2001
From: Tom Goff <thomas.goff@boeing.com>
Date: Fri, 14 Aug 2009 16:33:56 -0700
Subject: [PATCH] --- yaml --- r: 156911 b: refs/heads/master c:
 8cdb045632e5ee22854538619ac6f150eb0a4894 h: refs/heads/master i:   156909:
 b2c47ff2f5e445fea4a6f1614a05ab73295f3a72   156907:
 f8ab948fc356eef7d57d32a50a62a6ae3bf73538   156903:
 fd4fc86b879d8b8612bd1a19949d63078b3c175a   156895:
 5a904e501167880234453e9c1286bf0544d31c64 v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv4/ip_gre.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 29d96274dae8..8a658124c48f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c1d15d736687057f4dc6e51fbf44b6f6e4320cb
+refs/heads/master: 8cdb045632e5ee22854538619ac6f150eb0a4894
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index cb4a0f4bd5e5..82c11dd10a62 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/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;