diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-12-31 07:50:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:00:23 -0500 |
commit | 4828e7f49a402930e8b3e72de695c8d37e0f98ee (patch) | |
tree | 021c5d357b8a081bee8b8798e362b37999ee1ffb /net/ipv4/tcp_input.c | |
parent | cadbd0313bc897f5917d013174cdf9077edf4aa5 (diff) |
[TCP]: Remove TCPCB_URG & TCPCB_AT_TAIL as unnecessary
The snd_up check should be enough. I suspect this has been
there to provide a minor optimization in clean_rtx_queue which
used to have a small if (!->sacked) block which could skip
snd_up check among the other work.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7bac1fac065f..1e7fd8113663 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2821,8 +2821,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets) | |||
2821 | if (sacked & TCPCB_LOST) | 2821 | if (sacked & TCPCB_LOST) |
2822 | tp->lost_out -= acked_pcount; | 2822 | tp->lost_out -= acked_pcount; |
2823 | 2823 | ||
2824 | if (unlikely((sacked & TCPCB_URG) && tp->urg_mode && | 2824 | if (unlikely(tp->urg_mode && !before(end_seq, tp->snd_up))) |
2825 | !before(end_seq, tp->snd_up))) | ||
2826 | tp->urg_mode = 0; | 2825 | tp->urg_mode = 0; |
2827 | 2826 | ||
2828 | tp->packets_out -= acked_pcount; | 2827 | tp->packets_out -= acked_pcount; |