diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
tree | 25ccce9c837fbc7beef026b46852197b637be901 /net/ipv4/tcp_input.c | |
parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) | |
download | linux-6be7f5344b4fca35f1955aa73f0de825316a3236.tar.bz2 |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 609ff98aeb47..181fc8234a52 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5645,7 +5645,11 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack, tcp_fastopen_cache_set(sk, mss, cookie, syn_drop); if (data) { /* Retransmit unacked data in SYN */ - tcp_retransmit_skb(sk, data); + tcp_for_write_queue_from(data, sk) { + if (data == tcp_send_head(sk) || + __tcp_retransmit_skb(sk, data)) + break; + } tcp_rearm_rto(sk); return true; } |