diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /net/ipv4/tcp_cong.c | |
| parent | 9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
| download | kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.gz kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.xz kernel-crypto-d636b2798732f2cfba48d94aa19b7ba206268a83.zip | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/tcp_cong.c')
| -rw-r--r-- | net/ipv4/tcp_cong.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index 91c2f41c7f5..857eefc52aa 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -38,7 +38,7 @@ int tcp_register_congestion_control(struct tcp_congestion_ops *ca) int ret = 0; /* all algorithms must implement ssthresh and cong_avoid ops */ - if (!ca->ssthresh || !ca->cong_avoid || !ca->min_cwnd) { + if (!ca->ssthresh || !ca->cong_avoid) { printk(KERN_ERR "TCP %s does not implement required ops\n", ca->name); return -EINVAL; @@ -251,8 +251,8 @@ u32 tcp_reno_ssthresh(struct sock *sk) } EXPORT_SYMBOL_GPL(tcp_reno_ssthresh); -/* Lower bound on congestion window. */ -u32 tcp_reno_min_cwnd(struct sock *sk) +/* Lower bound on congestion window with halving. */ +u32 tcp_reno_min_cwnd(const struct sock *sk) { const struct tcp_sock *tp = tcp_sk(sk); return tp->snd_ssthresh/2; |