diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-30 16:11:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:04 -0700 |
| commit | 09c403dc7c8e73a4f9c553e4d84aef68af25ff65 (patch) | |
| tree | 0a6bfbdde7aa192140a8b7398e58d3f9f9a7b953 /net/ipv4/tcp_cong.c | |
| parent | 8a15a4b44f4f3348db373f70103b25a1175ea25b (diff) | |
| download | kernel_samsung_smdk4412-09c403dc7c8e73a4f9c553e4d84aef68af25ff65.zip kernel_samsung_smdk4412-09c403dc7c8e73a4f9c553e4d84aef68af25ff65.tar.gz kernel_samsung_smdk4412-09c403dc7c8e73a4f9c553e4d84aef68af25ff65.tar.bz2 | |
tcp: Apply device TSO segment limit earlier
[ Upstream commit 1485348d2424e1131ea42efc033cbd9366462b01 ]
Cache the device gso_max_segs in sock::sk_gso_max_segs and use it to
limit the size of TSO skbs. This avoids the need to fall back to
software GSO for local TCP senders.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/tcp_cong.c')
| -rw-r--r-- | net/ipv4/tcp_cong.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index 850c737..6cebfd2 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -290,7 +290,8 @@ int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight) left = tp->snd_cwnd - in_flight; if (sk_can_gso(sk) && left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd && - left * tp->mss_cache < sk->sk_gso_max_size) + left * tp->mss_cache < sk->sk_gso_max_size && + left < sk->sk_gso_max_segs) return 1; return left <= tcp_max_burst(tp); } |