diff options
author | Yonglong Li <liyonglong@chinatelecom.cn> | 2021-08-23 18:05:40 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-08-24 09:28:28 +0100 |
commit | 18fc1a922e2416998c5d37c26c69aab940c07ffb (patch) | |
tree | 9c6d64871d319bf69f16a1498dc18831348ac6ee /net/mptcp/protocol.h | |
parent | mptcp: move drop_other_suboptions check under pm lock (diff) | |
download | linux-dev-18fc1a922e2416998c5d37c26c69aab940c07ffb.tar.xz linux-dev-18fc1a922e2416998c5d37c26c69aab940c07ffb.zip |
mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate
Use MPTCP_ADD_ADDR_SIGNAL only for the action of sending ADD_ADDR, and
use MPTCP_ADD_ADDR_ECHO only for the action of sending ADD_ADDR echo.
Use msk->pm.local to save the announced ADD_ADDR address only, and reuse
msk->pm.remote to save the announced ADD_ADDR_ECHO address.
To prepare for the next patch.
Co-developed-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | net/mptcp/protocol.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 40bc9d31e1fa..3c388c1a9de4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -748,6 +748,12 @@ void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) { + return READ_ONCE(msk->pm.addr_signal) & + (BIT(MPTCP_ADD_ADDR_SIGNAL) | BIT(MPTCP_ADD_ADDR_ECHO)); +} + +static inline bool mptcp_pm_should_add_signal_addr(struct mptcp_sock *msk) +{ return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL); } |