Merge tag 'v3.10.103' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index ab151653c0502a8d20fb071b7028095d88d5717b..1e0c33efccbad0cb638fc16a2e210f63be21be5b 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3331,8 +3331,8 @@ static void tcp_send_challenge_ack(struct sock *sk)
 
                challenge_timestamp = now;
                ACCESS_ONCE(challenge_count) = half +
-                                       reciprocal_divide(prandom_u32(),
-                                                       sysctl_tcp_challenge_ack_limit);
+                                 reciprocal_divide(prandom_u32(),
+                                       sysctl_tcp_challenge_ack_limit);
        }
        count = ACCESS_ONCE(challenge_count);
        if (count > 0) {
@@ -5618,6 +5618,7 @@ discard:
                }
 
                tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
+               tp->copied_seq = tp->rcv_nxt;
                tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1;
 
                /* RFC1323: The window in SYN & SYN/ACK segments is