use is_mptcp instead of 'subflow->mp_capable'
---
net/mptcp/protocol.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 70e28cc0dbe0..283e7dc2d25e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -243,7 +243,6 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int
*err,
bool kern)
{
struct mptcp_sock *msk = mptcp_sk(sk);
- struct mptcp_subflow_context *subflow;
struct socket *listener;
struct sock *newsk;
@@ -258,13 +257,14 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int
*err,
if (!newsk)
return NULL;
- subflow = mptcp_subflow_ctx(newsk);
- pr_debug("msk=%p, new subflow=%p, ", msk, subflow);
+ pr_debug("msk=%p, subflow is mptcp=%d", msk, tcp_sk(newsk)->is_mptcp);
- if (subflow->mp_capable) {
+ if (tcp_sk(newsk)->is_mptcp) {
+ struct mptcp_subflow_context *subflow;
struct sock *new_mptcp_sock;
struct sock *ssk = newsk;
+ subflow = mptcp_subflow_ctx(newsk);
lock_sock(sk);
local_bh_disable();
@@ -295,8 +295,6 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int
*err,
bh_unlock_sock(new_mptcp_sock);
local_bh_enable();
release_sock(sk);
- } else {
- tcp_sk(newsk)->is_mptcp = 0;
}
return newsk;
--
2.21.0