From 01a2c58648c3947b9973c8267e8a2106a3022d71 Mon Sep 17 00:00:00 2001
From: Benjamin LaHaise <bcrl@kvack.org>
Date: Mon, 17 Dec 2007 22:27:36 -0800
Subject: [PATCH] --- yaml --- r: 78527 b: refs/heads/master c:
 170080645dac61816455afad807ffeb326ce79e8 h: refs/heads/master i:   78525:
 0c7ab6271b83e41ce469540a3746fcff06a67c30   78523:
 8ba65308e57ced85b0a4c623dfd6c54024055620   78519:
 02a74ab6340867de2177c876ade5591e86d72e09   78511:
 1f9bccf67dd184c77862ec81b9137722543fd35f   78495:
 de5f445cd34ac7b7b8e2c8f39159bdf0f5756808   78463:
 41cb137f1030ec0d67a3172fa3b24193ce1feacd v: v3

---
 [refs]                          | 2 +-
 trunk/net/netfilter/xt_TCPMSS.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 781c9dbae4fb..d8a1d8c0542d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a2ba07c31b0497fc82a8c175400ea8747da2ef
+refs/heads/master: 170080645dac61816455afad807ffeb326ce79e8
diff --git a/trunk/net/netfilter/xt_TCPMSS.c b/trunk/net/netfilter/xt_TCPMSS.c
index e4ee4bc81ff3..a1bc77fcd681 100644
--- a/trunk/net/netfilter/xt_TCPMSS.c
+++ b/trunk/net/netfilter/xt_TCPMSS.c
@@ -88,8 +88,11 @@ tcpmss_mangle_packet(struct sk_buff *skb,
 
 			oldmss = (opt[i+2] << 8) | opt[i+3];
 
-			if (info->mss == XT_TCPMSS_CLAMP_PMTU &&
-			    oldmss <= newmss)
+			/* Never increase MSS, even when setting it, as
+			 * doing so results in problems for hosts that rely
+			 * on MSS being set correctly.
+			 */
+			if (oldmss <= newmss)
 				return 0;
 
 			opt[i+2] = (newmss & 0xff00) >> 8;