diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
| commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
| tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /net/ipv4/tcp_input.c | |
| parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
| parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 788851ca8c5..c096a4218b8 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -2511,6 +2511,9 @@ static void tcp_mark_head_lost(struct sock *sk, int packets) | |||
| 2511 | int err; | 2511 | int err; |
| 2512 | unsigned int mss; | 2512 | unsigned int mss; |
| 2513 | 2513 | ||
| 2514 | if (packets == 0) | ||
| 2515 | return; | ||
| 2516 | |||
| 2514 | WARN_ON(packets > tp->packets_out); | 2517 | WARN_ON(packets > tp->packets_out); |
| 2515 | if (tp->lost_skb_hint) { | 2518 | if (tp->lost_skb_hint) { |
| 2516 | skb = tp->lost_skb_hint; | 2519 | skb = tp->lost_skb_hint; |