diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-30 16:11:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-02 00:19:17 -0700 |
| commit | 1485348d2424e1131ea42efc033cbd9366462b01 (patch) | |
| tree | 706d69b398cbd109fd3a9806fa485150d043cc52 /net/ipv4/tcp_cong.c | |
| parent | 7e6d06f0de3f74ca929441add094518ae332257c (diff) | |
| download | olio-linux-3.10-1485348d2424e1131ea42efc033cbd9366462b01.tar.xz olio-linux-3.10-1485348d2424e1131ea42efc033cbd9366462b01.zip | |
tcp: Apply device TSO segment limit earlier
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>
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 4d4db16e336..1432cdb0644 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -291,7 +291,8 @@ bool 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 true; return left <= tcp_max_tso_deferred_mss(tp); } |