git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipv4
/
tcp_htcp.c
diff --git
a/net/ipv4/tcp_htcp.c
b/net/ipv4/tcp_htcp.c
index
1b2ff53
..
6edfe5e
100644
(file)
--- a/
net/ipv4/tcp_htcp.c
+++ b/
net/ipv4/tcp_htcp.c
@@
-6,7
+6,6
@@
* http://www.hamilton.ie/net/htcp3.pdf
*/
* http://www.hamilton.ie/net/htcp3.pdf
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <net/tcp.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <net/tcp.h>
@@
-246,14
+245,6
@@
static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
}
}
}
}
-/* Lower bound on congestion window. */
-static u32 htcp_min_cwnd(struct sock *sk)
-{
- const struct tcp_sock *tp = tcp_sk(sk);
- return tp->snd_ssthresh;
-}
-
-
static void htcp_init(struct sock *sk)
{
struct htcp *ca = inet_csk_ca(sk);
static void htcp_init(struct sock *sk)
{
struct htcp *ca = inet_csk_ca(sk);
@@
-285,7
+276,6
@@
static void htcp_state(struct sock *sk, u8 new_state)
static struct tcp_congestion_ops htcp = {
.init = htcp_init,
.ssthresh = htcp_recalc_ssthresh,
static struct tcp_congestion_ops htcp = {
.init = htcp_init,
.ssthresh = htcp_recalc_ssthresh,
- .min_cwnd = htcp_min_cwnd,
.cong_avoid = htcp_cong_avoid,
.set_state = htcp_state,
.undo_cwnd = htcp_cwnd_undo,
.cong_avoid = htcp_cong_avoid,
.set_state = htcp_state,
.undo_cwnd = htcp_cwnd_undo,