diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
| commit | 0e770f4e70e8221454854b962adc258b6035ecdd (patch) | |
| tree | db146cb0453047b334e6cc882fda74fd7cba3525 /net/ipv4/tcp_input.c | |
| parent | a69ce65274ff1589bb64ea782a4178d7210da0bb (diff) | |
| parent | cd6f5814252060db2d38f57c602db33696c549c0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.02-android
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 22fc869465e8..293c65e13365 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5576,6 +5576,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 |