diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
| commit | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (patch) | |
| tree | 0fb90068b5b19436723d55bc44350776588c2992 /net/ipv4/tcp_input.c | |
| parent | ce9df0b00ac7f0a733d361c23bebdd79f32f8adc (diff) | |
| parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) | |
| download | talos-op-linux-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.tar.gz talos-op-linux-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.zip | |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes-non-critical
Some miscellaneous OMAP hwmod, powerdomain, and clock fixes for 3.10.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_3.10/20130331205716/
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 0d9bdacce99f..3bd55bad230a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2059,11 +2059,8 @@ void tcp_enter_loss(struct sock *sk, int how) if (tcp_is_reno(tp)) tcp_reset_reno_sack(tp); - if (!how) { - /* Push undo marker, if it was plain RTO and nothing - * was retransmitted. */ - tp->undo_marker = tp->snd_una; - } else { + tp->undo_marker = tp->snd_una; + if (how) { tp->sacked_out = 0; tp->fackets_out = 0; } |
