Change to defer congestion control initialization.
If setsockopt() was used to change TCP_CONGESTION before
connection is established, then protocols that use sequence numbers
to keep track of one RTT interval (vegas, illinois, ...) get confused.
Change the init hook to be called after handshake.
Signed-off-by: Stephen Hemminger [EMAIL PROTECTED]
---
net/ipv4/tcp_cong.c | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
--- net-2.6.22.orig/net/ipv4/tcp_cong.c
+++ net-2.6.22/net/ipv4/tcp_cong.c
@@ -79,18 +79,19 @@ void tcp_init_congestion_control(struct
struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_congestion_ops *ca;
- if (icsk-icsk_ca_ops != tcp_init_congestion_ops)
- return;
+ /* if no choice made yet assign the current value set as default */
+ if (icsk-icsk_ca_ops == tcp_init_congestion_ops) {
+ rcu_read_lock();
+ list_for_each_entry_rcu(ca, tcp_cong_list, list) {
+ if (try_module_get(ca-owner)) {
+ icsk-icsk_ca_ops = ca;
+ break;
+ }
- rcu_read_lock();
- list_for_each_entry_rcu(ca, tcp_cong_list, list) {
- if (try_module_get(ca-owner)) {
- icsk-icsk_ca_ops = ca;
- break;
+ /* fallback to next available */
}
-
+ rcu_read_unlock();
}
- rcu_read_unlock();
if (icsk-icsk_ca_ops-init)
icsk-icsk_ca_ops-init(sk);
@@ -238,6 +239,7 @@ int tcp_set_congestion_control(struct so
rcu_read_lock();
ca = tcp_ca_find(name);
+
/* no change asking for existing value */
if (ca == icsk-icsk_ca_ops)
goto out;
@@ -263,7 +265,8 @@ int tcp_set_congestion_control(struct so
else {
tcp_cleanup_congestion_control(sk);
icsk-icsk_ca_ops = ca;
- if (icsk-icsk_ca_ops-init)
+
+ if (sk-sk_state != TCP_CLOSE icsk-icsk_ca_ops-init)
icsk-icsk_ca_ops-init(sk);
}
out:
--
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
