Re: [MPTCP] [PATCH] mptcp: Restore lost hunk

Re: [MPTCP] [PATCH] mptcp: Restore lost hunk

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

Hi Peter,

On 23/08/2019 00:46, Peter Krystad wrote:
> This chunk from Patch 01 "Extend path manager interface" of
> the Implement outgoing MP_JOIN patchset did not survive
> getting squashed and needs to be restored.
> 
> squashto: Add path manager interface

Thank you for the patch and again good catch for having seen the missing
part (sorry for that)! Just applied the patch:

- 5d51e217f066: "squashed" in "mptcp: Add path manager interface"
- 328298c32eac..3558511b2489: result

Tests and export in progress.

Cheers,
Matt
-- 
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium

[MPTCP] [PATCH] mptcp: Restore lost hunk

[Peter Krystad]

[-- Attachment #1: Type: text/plain, Size: 996 bytes --]

This chunk from Patch 01 "Extend path manager interface" of
the Implement outgoing MP_JOIN patchset did not survive
getting squashed and needs to be restored.

squashto: Add path manager interface

Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/options.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 0e7abcea5bae..be7afa5aac6a 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -534,6 +534,16 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,
 
 	mp_opt = &opt_rx->mptcp;
 
+	if (msk && mp_opt->add_addr) {
+		if (mp_opt->family == MPTCP_ADDR_IPVERSION_4)
+			pm_add_addr(msk, &mp_opt->addr, mp_opt->addr_id);
+#if IS_ENABLED(CONFIG_IPV6)
+		else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6)
+			pm_add_addr6(msk, &mp_opt->addr6, mp_opt->addr_id);
+#endif
+		mp_opt->add_addr = 0;
+	}
+
 	if (!mp_opt->dss)
 		return;
 
-- 
2.17.2