* [MPTCP] [PATCH 4/4] mptcp: remove unneeded check in mptcp_established_options_mp()
@ 2019-11-11 16:53 Paolo Abeni
0 siblings, 0 replies; only message in thread
From: Paolo Abeni @ 2019-11-11 16:53 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 959 bytes --]
we now have centralized check in mptcp_established_options()
Squash-to: "mptcp: Add handling of outgoing MP_JOIN requests"
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/options.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index e0c6a3b98544..9080a5fed918 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -371,8 +371,7 @@ static bool mptcp_established_options_mp(struct sock *sk, unsigned int *size,
pr_debug("subflow=%p, local_key=%llu, remote_key=%llu",
subflow, subflow->local_key, subflow->remote_key);
return true;
- } else if (subflow->mp_join && !subflow->fourth_ack &&
- remaining >= TCPOLEN_MPTCP_MPJ_ACK) {
+ } else if (subflow->mp_join && !subflow->fourth_ack) {
opts->suboptions = OPTION_MPTCP_MPJ_ACK;
memcpy(opts->hmac, subflow->hmac, MPTCPOPT_HMAC_LEN);
*size = TCPOLEN_MPTCP_MPJ_ACK;
--
2.21.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-11 16:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-11 16:53 [MPTCP] [PATCH 4/4] mptcp: remove unneeded check in mptcp_established_options_mp() Paolo Abeni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.