diff options
| author | David S. Miller <davem@davemloft.net> | 2006-03-12 03:51:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-12 03:51:49 +0100 |
| commit | ba244fe9005323452428fee4b4b7d0c70a06b627 (patch) | |
| tree | a2f64703eeb1cae57ea3d4b5d2dd481614ae82d1 | |
| parent | [NETFILTER]: Fix wrong option spelling in Makefile for CONFIG_BRIDGE_EBT_ULOG (diff) | |
| download | linux-ba244fe9005323452428fee4b4b7d0c70a06b627.tar.xz linux-ba244fe9005323452428fee4b4b7d0c70a06b627.zip | |
[TCP]: Fix tcp_tso_should_defer() when limit>=65536
That's >= a full sized TSO frame, so we should always
return 0 in that case.
Based upon a report and initial patch from Lachlan
Andrew, final patch suggested by Herbert Xu.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index a7623ead39a8..9f498a6c8895 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1036,6 +1036,10 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ limit = min(send_win, cong_win); + /* If a full-sized TSO skb can be sent, do it. */ + if (limit >= 65536) + return 0; + if (sysctl_tcp_tso_win_divisor) { u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); |