diff options
| author | David S. Miller | 2012-03-05 21:16:26 -0500 |
|---|---|---|
| committer | David S. Miller | 2012-03-05 21:16:26 -0500 |
| commit | f6a1ad4295f9291038380178d09978caf6982dd8 (patch) | |
| tree | 7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /net/ipv4 | |
| parent | 036dafa28da1e2565a8529de2ae663c37b7a0060 (diff) | |
| parent | f3969bf78f140f437f51787dfc2751943ba454d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/vmxnet3/vmxnet3_drv.c
Small vmxnet3 conflict with header size bug fix in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -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 ee42d42b2f45..d9b83d198c3d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2569,6 +2569,7 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head) if (cnt > packets) { if ((tcp_is_sack(tp) && !tcp_is_fack(tp)) || + (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED) || (oldcnt >= packets)) break; |