Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[sfrench/cifs-2.6.git] / net / ipv4 / tcp_veno.c

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 2bf618a3b00b6f71ec3bb3c41ed171010acda2ab..d08b2e855c229334fcec88bb765cb26dbb6e34c7 100644 (file)
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -119,8 +119,10 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
        struct tcp_sock *tp = tcp_sk(sk);
        struct veno *veno = inet_csk_ca(sk);
 
-       if (!veno->doing_veno_now)
-               return tcp_reno_cong_avoid(sk, ack, in_flight);
+       if (!veno->doing_veno_now) {
+               tcp_reno_cong_avoid(sk, ack, in_flight);
+               return;
+       }
 
        /* limited by applications */
        if (!tcp_is_cwnd_limited(sk, in_flight))