diff options
| author |   Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-12-20 20:36:03 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 14:59:36 -0800 |
| commit | bd515c3e48ececd774eb3128e81b669dbbd32637 (patch) | |
| tree | 8e2dd3386a47bfddb85c1557e9f2887660b19018 /net/ipv4/tcp_output.c | |
| parent | [TG3]: Update version to 3.87 (diff) | |
| download | linux-dev-bd515c3e48ececd774eb3128e81b669dbbd32637.tar.xz linux-dev-bd515c3e48ececd774eb3128e81b669dbbd32637.zip | |
[TCP]: Fix TSO deferring
I'd say that most of what tcp_tso_should_defer had in between
there was dead code because of this.
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_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9a985b55e7d8..7c50271ddc30 100644 --- a/net/ipv4/tcp_output.c +++ b/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); |