tgupdate: merge t/upstream base into t/upstream

multipath-tcp · Jun 11, 2021 · 4e92195 · 4e92195
2 parents ae2f628 + e6ddd55
commit 4e92195
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
@@ -912,6 +912,9 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
  return false;
  }
 
+ if (mp_opt->deny_join_id0)
+ WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
+
  if (unlikely(!READ_ONCE(msk->pm.server_side)))
  pr_warn_once("bogus mpc option on established client sk");
  mptcp_subflow_fully_established(subflow, mp_opt);
@@ -1053,8 +1056,6 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
  }
 
  mptcp_get_options(sk, skb, &mp_opt);
- if (mp_opt.deny_join_id0)
- WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
  if (!check_fully_established(msk, sk, subflow, skb, &mp_opt))
  return;