Squash to "mptcp: add use_id parameter for addresses_equal v6"

[PATCH mptcp-next] Squash to "mptcp: add use_id parameter for addresses_equal v6"

Geliang Tang posted 1 patch 5 months, 4 weeks ago

Download mbox

Failed in applying to current master (apply log)

net/mptcp/pm_netlink.c | 2 ++
1 file changed, 2 insertions(+)

Expand all Fold all

[PATCH mptcp-next] Squash to "mptcp: add use_id parameter for addresses_equal v6"

Posted by Geliang Tang 5 months, 4 weeks ago

Squash to:
[mptcp-next,v6,07/20] mptcp: drop lookup_by_id parameter in lookup_addr

Fix mptcp/add_addr packetdrill warnings in v6 reported by CI:

KVM Validation: normal (except selftest_mptcp_join): Unstable: 1 failed test(s): packetdrill_add_addr

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/pm_netlink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 95d99927b144..d2e53836f45e 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -72,6 +72,8 @@ bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
 	if (!use_port && !use_id)
 		return true;
 
+	if (use_port && use_id)
+		return (a->port == b->port) && (a->id == b->id);
 	if (use_port)
 		return a->port == b->port;
 	return a->id == b->id;
-- 
2.35.3