aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2d690b3f0a7b..40824b380ef8 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3104,7 +3104,7 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb,
3104 * arrived at the other end. 3104 * arrived at the other end.
3105 */ 3105 */
3106static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets, 3106static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
3107 u32 prior_snd_una, 3107 u32 prior_snd_una, int *acked,
3108 struct tcp_sacktag_state *sack) 3108 struct tcp_sacktag_state *sack)
3109{ 3109{
3110 const struct inet_connection_sock *icsk = inet_csk(sk); 3110 const struct inet_connection_sock *icsk = inet_csk(sk);
@@ -3277,6 +3277,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
3277 } 3277 }
3278 } 3278 }
3279#endif 3279#endif
3280 *acked = pkts_acked;
3280 return flag; 3281 return flag;
3281} 3282}
3282 3283
@@ -3642,10 +3643,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
3642 goto no_queue; 3643 goto no_queue;
3643 3644
3644 /* See if we can take anything off of the retransmit queue. */ 3645 /* See if we can take anything off of the retransmit queue. */
3645 acked = tp->packets_out; 3646 flag |= tcp_clean_rtx_queue(sk, prior_fackets, prior_snd_una, &acked,
3646 flag |= tcp_clean_rtx_queue(sk, prior_fackets, prior_snd_una,
3647 &sack_state); 3647 &sack_state);
3648 acked -= tp->packets_out;
3649 3648
3650 if (tcp_ack_is_dubious(sk, flag)) { 3649 if (tcp_ack_is_dubious(sk, flag)) {
3651 is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP)); 3650 is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP));