Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / net / ipv4 / tcp_htcp.c

diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 283be3cb46670a96114665ef4b1d1e2bb0e7bc98..63318b6e9d512e139861eed32148488093c17a08 100644 (file)
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -26,12 +26,12 @@ struct htcp {
        u32     alpha;          /* Fixed point arith, << 7 */
        u8      beta;           /* Fixed point arith, << 7 */
        u8      modeswitch;     /* Delay modeswitch until we had at least one congestion event */
-       u32     last_cong;      /* Time since last congestion event end */
-       u32     undo_last_cong;
        u16     pkts_acked;
        u32     packetcount;
        u32     minRTT;
        u32     maxRTT;
+       u32     last_cong;      /* Time since last congestion event end */
+       u32     undo_last_cong;
 
        u32     undo_maxRTT;
        u32     undo_old_maxB;
@@ -224,7 +224,7 @@ static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
        if (!tcp_is_cwnd_limited(sk, in_flight))
                return;
 
-        if (tp->snd_cwnd <= tp->snd_ssthresh)
+       if (tp->snd_cwnd <= tp->snd_ssthresh)
                tcp_slow_start(tp);
        else {