---

yaml --- r: 122535 b: refs/heads/master c: 9969ca5 h: refs/heads/master i: 122533: 7bad513 122531: f029434 122527: b2fdc70 v: v3
git-mirror · Dec 6, 2008 · 936ef29 · 936ef29
1 parent 5607e4e
commit 936ef29
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: f0bc52f38b09308fca85f3aa9300a341364fe9c6
+refs/heads/master: 9969ca5f205988fb96461075cb4914c55cf166b5
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -1481,7 +1481,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
 
 	/* Normally R but no L won't result in plain S */
 	if (!dup_sack &&
-	    (TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) == TCPCB_SACKED_RETRANS)
+	    (TCP_SKB_CB(skb)->sacked & (TCPCB_LOST|TCPCB_SACKED_RETRANS)) == TCPCB_SACKED_RETRANS)
 		goto fallback;
 	if (!skb_can_shift(skb))
 		goto fallback;