diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /net/ipv4/tcp.c | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b1234a75d6a6..27dd240ba10e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -1368,6 +1368,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, | |||
| 1368 | sk_eat_skb(sk, skb, 0); | 1368 | sk_eat_skb(sk, skb, 0); |
| 1369 | if (!desc->count) | 1369 | if (!desc->count) |
| 1370 | break; | 1370 | break; |
| 1371 | tp->copied_seq = seq; | ||
| 1371 | } | 1372 | } |
| 1372 | tp->copied_seq = seq; | 1373 | tp->copied_seq = seq; |
| 1373 | 1374 | ||