---

yaml --- r: 156911 b: refs/heads/master c: 8cdb045 h: refs/heads/master i: 156909: b2c47ff 156907: f8ab948 156903: fd4fc86 156895: 5a904e5 v: v3
git-mirror · Aug 14, 2009 · 5ca3b01 · 5ca3b01
1 parent 2973634
commit 5ca3b01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;