From bcd55a42eb1dafe311e3784e8a7e90c85747ded1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Thu, 20 Dec 2007 20:36:03 -0800 Subject: [PATCH] --- yaml --- r: 78589 b: refs/heads/master c: bd515c3e48ececd774eb3128e81b669dbbd32637 h: refs/heads/master i: 78587: 2477568b38d682ae229b8fbfb40dd75569fee4e7 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05a637be042f..5da4d53c2721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 255f97b3117cbe10b2493f7f12d66a81dfbcdf43 +refs/heads/master: bd515c3e48ececd774eb3128e81b669dbbd32637 diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index 9a985b55e7d8..7c50271ddc30 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -1230,7 +1230,8 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) goto send_now; /* Defer for less than two clock ticks. */ - if (!tp->tso_deferred && ((jiffies<<1)>>1) - (tp->tso_deferred>>1) > 1) + if (tp->tso_deferred && + ((jiffies << 1) >> 1) - (tp->tso_deferred >> 1) > 1) goto send_now; in_flight = tcp_packets_in_flight(tp);