drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack

[safe/jmp/linux-2.6] / net / ipv4 / tcp_htcp.c

diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 26d5c7f..7c94a49 100644 (file)
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -92,8 +92,8 @@ static inline void measure_rtt(struct sock *sk, u32 srtt)
        if (icsk->icsk_ca_state == TCP_CA_Open) {
                if (ca->maxRTT < ca->minRTT)
                        ca->maxRTT = ca->minRTT;
-               if (ca->maxRTT < srtt
-                   && srtt <= ca->maxRTT + msecs_to_jiffies(20))
+               if (ca->maxRTT < srtt &&
+                   srtt <= ca->maxRTT + msecs_to_jiffies(20))
                        ca->maxRTT = srtt;
        }
 }
@@ -123,9 +123,9 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt
 
        ca->packetcount += pkts_acked;
 
-       if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1)
-           && now - ca->lasttime >= ca->minRTT
-           && ca->minRTT > 0) {
+       if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1) &&
+           now - ca->lasttime >= ca->minRTT &&
+           ca->minRTT > 0) {
                __u32 cur_Bi = ca->packetcount * HZ / (now - ca->lasttime);
 
                if (htcp_ccount(ca) <= 3) {