kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[TCP]: Remove seq_rtt ptr from clean_rtx_queue args

Browse source 
While checking Gavin's patch I noticed that the returned seq_rtt
is not used by the caller.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen 2007-12-24 21:55:39 -08:00 committed by David S. Miller
parent 0e3a4803aa
commit c776ee01bd
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ipv4/tcp_input.c
View file

@ -2759,8 +2759,7 @@ static u32 tcp_tso_acked(struct sock *sk, struct sk_buff *skb)
* is before the ack sequence we can discard it as it's confirmed to have * is before the ack sequence we can discard it as it's confirmed to have
* arrived at the other end. * arrived at the other end.
*/ */
static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p, static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets)
int prior_fackets)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
const struct inet_connection_sock *icsk = inet_csk(sk); 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,
} }
} }
#endif #endif
*seq_rtt_p = seq_rtt;
return flag; return flag;
} }
@ -3152,7 +3150,6 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
u32 ack = TCP_SKB_CB(skb)->ack_seq; u32 ack = TCP_SKB_CB(skb)->ack_seq;
u32 prior_in_flight; u32 prior_in_flight;
u32 prior_fackets; u32 prior_fackets;
s32 seq_rtt;
int prior_packets; int prior_packets;
int frto_cwnd = 0; int frto_cwnd = 0;
@ -3218,7 +3215,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
goto no_queue; goto no_queue;
/* See if we can take anything off of the retransmit queue. */ /* See if we can take anything off of the retransmit queue. */
flag |= tcp_clean_rtx_queue(sk, &seq_rtt, prior_fackets); flag |= tcp_clean_rtx_queue(sk, prior_fackets);
if (tp->frto_counter) if (tp->frto_counter)
frto_cwnd = tcp_process_frto(sk, flag); frto_cwnd = tcp_process_frto(sk, flag);