Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[linux-2.6-block.git] / net / ipv4 / tcp_yeah.c

diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
index 66b6821b984ed6cde6d0f77bcaeb06baf0d21de7..a0f2403588922654afcbbdf1777a40af99d5ad3a 100644 (file)
--- a/net/ipv4/tcp_yeah.c
+++ b/net/ipv4/tcp_yeah.c
@@ -157,8 +157,8 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
 
                        if (queue > TCP_YEAH_ALPHA ||
                            rtt - yeah->vegas.baseRTT > (yeah->vegas.baseRTT / TCP_YEAH_PHY)) {
-                               if (queue > TCP_YEAH_ALPHA
-                                   && tp->snd_cwnd > yeah->reno_count) {
+                               if (queue > TCP_YEAH_ALPHA &&
+                                   tp->snd_cwnd > yeah->reno_count) {
                                        u32 reduction = min(queue / TCP_YEAH_GAMMA ,
                                                            tp->snd_cwnd >> TCP_YEAH_EPSILON);