projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
net
/
ipv4
/
tcp_vegas.c
diff --git
a/net/ipv4/tcp_vegas.c
b/net/ipv4/tcp_vegas.c
index
13e7e6e
..
490360b
100644
(file)
--- a/
net/ipv4/tcp_vegas.c
+++ b/
net/ipv4/tcp_vegas.c
@@
-31,7
+31,6
@@
* assumed senders never went idle.
*/
* assumed senders never went idle.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/skbuff.h>
@@
-330,6
+329,10
@@
static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
vegas->cntRTT = 0;
vegas->minRTT = 0x7fffffff;
}
vegas->cntRTT = 0;
vegas->minRTT = 0x7fffffff;
}
+ /* Use normal slow start */
+ else if (tp->snd_cwnd <= tp->snd_ssthresh)
+ tcp_slow_start(tp);
+
}
/* Extract info for Tcp socket info provided via netlink. */
}
/* Extract info for Tcp socket info provided via netlink. */