diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_input.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 519bd24e0d3b..efea9873208e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2759,8 +2759,7 @@ static u32 tcp_tso_acked(struct sock *sk, struct sk_buff *skb) | |||
2759 | * is before the ack sequence we can discard it as it's confirmed to have | 2759 | * is before the ack sequence we can discard it as it's confirmed to have |
2760 | * arrived at the other end. | 2760 | * arrived at the other end. |
2761 | */ | 2761 | */ |
2762 | static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p, | 2762 | static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets) |
2763 | int prior_fackets) | ||
2764 | { | 2763 | { |
2765 | struct tcp_sock *tp = tcp_sk(sk); | 2764 | struct tcp_sock *tp = tcp_sk(sk); |
2766 | const struct inet_connection_sock *icsk = inet_csk(sk); | 2765 | const struct inet_connection_sock *icsk = inet_csk(sk); |
@@ -2915,7 +2914,6 @@ static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p, | |||
2915 | } | 2914 | } |
2916 | } | 2915 | } |
2917 | #endif | 2916 | #endif |
2918 | *seq_rtt_p = seq_rtt; | ||
2919 | return flag; | 2917 | return flag; |
2920 | } | 2918 | } |
2921 | 2919 | ||
@@ -3152,7 +3150,6 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) | |||
3152 | u32 ack = TCP_SKB_CB(skb)->ack_seq; | 3150 | u32 ack = TCP_SKB_CB(skb)->ack_seq; |
3153 | u32 prior_in_flight; | 3151 | u32 prior_in_flight; |
3154 | u32 prior_fackets; | 3152 | u32 prior_fackets; |
3155 | s32 seq_rtt; | ||
3156 | int prior_packets; | 3153 | int prior_packets; |
3157 | int frto_cwnd = 0; | 3154 | int frto_cwnd = 0; |
3158 | 3155 | ||
@@ -3218,7 +3215,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) | |||
3218 | goto no_queue; | 3215 | goto no_queue; |
3219 | 3216 | ||
3220 | /* See if we can take anything off of the retransmit queue. */ | 3217 | /* See if we can take anything off of the retransmit queue. */ |
3221 | flag |= tcp_clean_rtx_queue(sk, &seq_rtt, prior_fackets); | 3218 | flag |= tcp_clean_rtx_queue(sk, prior_fackets); |
3222 | 3219 | ||
3223 | if (tp->frto_counter) | 3220 | if (tp->frto_counter) |
3224 | frto_cwnd = tcp_process_frto(sk, flag); | 3221 | frto_cwnd = tcp_process_frto(sk, flag); |