The current conditions prevent any coalescing when the receive buffer
is small. Ensure that MPTCP can always aggregate at least at max GSO size.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
Note:
- or we can drop entirely the rcvbuf-related check, to be verified vs
simult_flows tests
---
net/mptcp/protocol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 9cf135e04d69..8ddd4bb5172e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -161,7 +161,7 @@ static bool __mptcp_try_coalesce(struct sock *sk, struct sk_buff *to,
if (unlikely(MPTCP_SKB_CB(to)->cant_coalesce) ||
MPTCP_SKB_CB(from)->offset ||
- ((to->len + from->len) > (limit >> 3)) ||
+ ((to->len + from->len) > max(U16_MAX, (limit >> 3))) ||
!skb_try_coalesce(to, from, fragstolen, delta))
return false;
--
2.53.0