diff options
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9b98d35aa0d8..094c429b4401 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1257,7 +1257,7 @@ static void tcp_adjust_pcount(struct sock *sk, const struct sk_buff *skb, int de | |||
1257 | 1257 | ||
1258 | if (tp->lost_skb_hint && | 1258 | if (tp->lost_skb_hint && |
1259 | before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) && | 1259 | before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) && |
1260 | (tcp_is_fack(tp) || (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED))) | 1260 | (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) |
1261 | tp->lost_cnt_hint -= decr; | 1261 | tp->lost_cnt_hint -= decr; |
1262 | 1262 | ||
1263 | tcp_verify_left_out(tp); | 1263 | tcp_verify_left_out(tp); |
@@ -2961,9 +2961,6 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) | |||
2961 | * retransmitted data is acknowledged. It tries to continue | 2961 | * retransmitted data is acknowledged. It tries to continue |
2962 | * resending the rest of the retransmit queue, until either | 2962 | * resending the rest of the retransmit queue, until either |
2963 | * we've sent it all or the congestion window limit is reached. | 2963 | * we've sent it all or the congestion window limit is reached. |
2964 | * If doing SACK, the first ACK which comes back for a timeout | ||
2965 | * based retransmit packet might feed us FACK information again. | ||
2966 | * If so, we use it to avoid unnecessarily retransmissions. | ||
2967 | */ | 2964 | */ |
2968 | void tcp_xmit_retransmit_queue(struct sock *sk) | 2965 | void tcp_xmit_retransmit_queue(struct sock *sk) |
2969 | { | 2966 | { |