diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-02-10 00:05:18 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:33 +0000 |
| commit | 649917478f4c580f6c0a46c99ebff7381581530b (patch) | |
| tree | 58777d362c8297297de6ce2a6c44c67e961a84c9 /include | |
| parent | 9fefe0d3228bb6a874bf3bf7628dd198347abf64 (diff) | |
| download | linux-stable-649917478f4c580f6c0a46c99ebff7381581530b.tar.gz linux-stable-649917478f4c580f6c0a46c99ebff7381581530b.tar.bz2 linux-stable-649917478f4c580f6c0a46c99ebff7381581530b.zip | |
Revert "tcp: Apply device TSO segment limit earlier"
This reverts commit 9f871e883277cc22c6217db806376dce52401a31, which
was commit 1485348d2424e1131ea42efc033cbd9366462b01 upstream.
It can cause connections to stall when a PMTU event occurs. This was
fixed by commit 843925f33fcc ("tcp: Do not apply TSO segment limit to
non-TSO packets") upstream, but that depends on other changes to TSO.
The original issue this fixed was a performance regression for the sfc
driver in extreme cases of TSO (skb with > 100 segments). This is not
really very important and it seems best to revert it rather than try
to fix it up.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: netdev@vger.kernel.org
Cc: linux-net-drivers@solarflare.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index e6454b6980dd..c8dcbb808993 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -194,7 +194,6 @@ struct sock_common { * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) * @sk_gso_max_size: Maximum GSO segment size to build - * @sk_gso_max_segs: Maximum number of GSO segments * @sk_lingertime: %SO_LINGER l_linger setting * @sk_backlog: always used with the per-socket spinlock held * @sk_callback_lock: used with the callbacks in the end of this struct @@ -311,7 +310,6 @@ struct sock { int sk_route_nocaps; int sk_gso_type; unsigned int sk_gso_max_size; - u16 sk_gso_max_segs; int sk_rcvlowat; unsigned long sk_lingertime; struct sk_buff_head sk_error_queue; |