diff mbox series

[v2,mptcp-next] Squash to "mptcp: change add_addr_signal type"

Message ID 2e843951407af41605d55c56e4b55009b873e154.1604025904.git.geliangtang@gmail.com
State Accepted, archived
Commit 318b7b1ebc1816c6349d010435853e361573f945
Delegated to: Matthieu Baerts
Headers show
Series [v2,mptcp-next] Squash to "mptcp: change add_addr_signal type" | expand

Commit Message

Geliang Tang Oct. 30, 2020, 3 a.m. UTC 
This patch added a new helper mptcp_pm_should_add_signal_echo.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 v2:
 - make it as a squash-to patch.
 - change 'Subject' from 'mptcp: add mptcp_pm_should_add_signal_echo helper'
   to 'Squash to "mptcp: change add_addr_signal type"'

This patch will conflict with 'mptcp: send out dedicated ADD_ADDR packet':

"""
<<<<<<< HEAD
static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
{
        return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
=======
static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)
{
        return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
>>>>>>> 20761fc28b53... mptcp: send out dedicated ADD_ADDR packet
}
"""

Please resolve the conflict like this:

"""
static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
{
        return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
}

static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)
{       
        return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
}
"""
---
 net/mptcp/pm.c       | 2 +-
 net/mptcp/protocol.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Matthieu Baerts Oct. 30, 2020, 4:52 p.m. UTC | #1 
Hi Geliang,

On 30/10/2020 04:00, Geliang Tang wrote:
> This patch added a new helper mptcp_pm_should_add_signal_echo.

Thank you for this new version, the review and very nice to have the 
instructions to resolve the conflicts :)

- 318b7b1ebc18: "squashed" in "mptcp: change add_addr_signal type"
- 8f27a4639728: conflict in t/mptcp-send-out-dedicated-ADD_ADDR-packet
- Results: f17a31885e27..737e1d7e3eae

Tests + export are in progress!

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index bc6619670d37..c2c12f02a263 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -186,7 +186,7 @@  bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
 	if (!mptcp_pm_should_add_signal(msk))
 		goto out_unlock;
 
-	*echo = READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
+	*echo = mptcp_pm_should_add_signal_echo(msk);
 
 	if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo))
 		goto out_unlock;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 977e74dc45eb..77eae8addc91 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -524,6 +524,11 @@  static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
 	return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL);
 }
 
+static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
+{
+	return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
+}
+
 static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)
 {
 	return READ_ONCE(msk->pm.rm_addr_signal);