Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 3 insertions, 0 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 2d41d5d6ad19..9122814c13ad 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2048,6 +2048,7 @@ static int tcp_v4_init_sock(struct sock *sk)
         tp->mss_cache_std = tp->mss_cache = 536;
 
         tp->reordering = sysctl_tcp_reordering;
+        tp->ca_ops = &tcp_reno;
 
         sk->sk_state = TCP_CLOSE;
 
@@ -2070,6 +2071,8 @@ int tcp_v4_destroy_sock(struct sock *sk)
 
         tcp_clear_xmit_timers(sk);
 
+        tcp_cleanup_congestion_control(tp);
+
         /* Cleanup up the write buffer. */
         sk_stream_writequeue_purge(sk);