lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TCP]: Remove local variable and use packets_in_flight directly

Browse Source 
Lines won't be that long and it's compiler's job to optimize
them.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen
2007-12-02 00:48:01 +02:00
committed by David S. Miller
parent 50c4817e99
commit d67c58e9ae
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv4/tcp_output.c
View File

@@ -1293,7 +1293,6 @@ static int tcp_mtu_probe(struct sock *sk)
int len; int len;
int probe_size; int probe_size;
int size_needed; int size_needed;
unsigned int pif;
int copy; int copy;
int mss_now; int mss_now;
@@ -1326,11 +1325,9 @@ static int tcp_mtu_probe(struct sock *sk)
if (after(tp->snd_nxt + size_needed, tp->snd_una + tp->snd_wnd)) if (after(tp->snd_nxt + size_needed, tp->snd_una + tp->snd_wnd))
return 0; return 0;
/* Do we need to wait to drain cwnd? */ /* Do we need to wait to drain cwnd? With none in flight, don't stall */
pif = tcp_packets_in_flight(tp); if (tcp_packets_in_flight(tp) + 2 > tp->snd_cwnd) {
if (pif + 2 > tp->snd_cwnd) { if (!tcp_packets_in_flight(tp))
/* With no packets in flight, don't stall. */
if (pif == 0)
return -1; return -1;
else else
return 0; return 0;