---

yaml --- r: 34662 b: refs/heads/master c: ff9b5e0 h: refs/heads/master v: v3
git-mirror · Sep 22, 2006 · 8db65ba · 8db65ba
1 parent d791d67
commit 8db65ba
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: 3015d5d4e5b15eddea272a697e83391100581932
+refs/heads/master: ff9b5e0f08cb650d113eef0c654f931c0a7ae730
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -127,7 +127,7 @@ static void tcp_measure_rcv_mss(struct sock *sk,
 	/* skb->len may jitter because of SACKs, even if peer
 	 * sends good full-sized frames.
 	 */
-	len = skb->len;
+	len = skb_shinfo(skb)->gso_size ?: skb->len;
 	if (len >= icsk->icsk_ack.rcv_mss) {
 		icsk->icsk_ack.rcv_mss = len;
 	} else {