From: David S. Miller Date: Sun, 12 Mar 2006 02:51:49 +0000 (-0800) Subject: [TCP]: Fix tcp_tso_should_defer() when limit>=65536 X-Git-Tag: v2.6.16~58 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba244fe9005323452428fee4b4b7d0c70a06b627;p=linux-2.6-omap-h63xx.git [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 --- diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index a7623ead39a..9f498a6c889 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);