summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-05 15:20:55 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-05 15:20:55 -0700
commitcb83199a29dc0408423d6df432f28cc67fcadaf4 (patch)
tree3f6101b6657da5131d19a507ae264675799527df
parenta56476962e92a6c389a1a561274d4a27607b7b5f (diff)
downloadlinux-3.10-cb83199a29dc0408423d6df432f28cc67fcadaf4.tar.gz
linux-3.10-cb83199a29dc0408423d6df432f28cc67fcadaf4.tar.bz2
linux-3.10-cb83199a29dc0408423d6df432f28cc67fcadaf4.zip
[TCP]: Do not call tcp_tso_acked() if no work to do.
In tcp_clean_rtx_queue(), if the TSO packet is not even partially acked, do not waste time calling tcp_tso_acked(). Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1dba7fd438d..b948e4eb39b 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2038,7 +2038,8 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p, s32 *seq_usrtt
* the other end.
*/
if (after(scb->end_seq, tp->snd_una)) {
- if (tcp_skb_pcount(skb) > 1)
+ if (tcp_skb_pcount(skb) > 1 &&
+ after(tp->snd_una, scb->seq))
acked |= tcp_tso_acked(sk, skb,
now, &seq_rtt);
break;