options: copy entire extension area to option struct
Subsystems (2)
Florian Westphal
PATCH 1/1 options: copy entire extension area to option struct
No reason to copy each member individually, just copy everything. This means we will also copy ext->data_fin which was not done before.
squashto: "mptcp: Write MPTCP DSS headers to outgoing data packets"
--- net/mptcp/options.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/mptcp/options.c +2 -7
@@ -402,13 +402,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,if (map_size <= remaining) { remaining -= map_size; dss_size = map_size; -if (mpext) { - opts->ext_copy.data_seq = mpext->data_seq; - opts->ext_copy.subflow_seq = mpext->subflow_seq; - opts->ext_copy.data_len = mpext->data_len; - opts->ext_copy.use_map =1 ; - opts->ext_copy.dsn64 = mpext->dsn64; - } +if (mpext) + opts->ext_copy = *mpext; }else { opts->ext_copy.use_map =0 ;WARN_ONCE (1 ,"MPTCP: Map dropped" );
Signature · 1 line
2.21.0
Mat Martineau
Quoted 2 lines · Florian Westphal
No reason to copy each member individually, just copy everything. This means we will also copy
ext->data_finwhich was not done before.
Looks good to me. I think the missing data_fin copy was a bug.
Mat
Quoted 34 lines
squashto: "mptcp: Write MPTCP DSS headers to outgoing data packets"
Signed-off-by Florian Westphal <fw(a)strlen.de>---
net/mptcp/options.c| 9 ++-------1 file changed, 2 insertions(+), 7 deletions(-)net/mptcp/options.c +2
-7@@ -402,13 +402,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,if (map_size <= remaining) { remaining -= map_size; dss_size = map_size; -if (mpext) { - opts->ext_copy.data_seq = mpext->data_seq; - opts->ext_copy.subflow_seq = mpext->subflow_seq; - opts->ext_copy.data_len = mpext->data_len; - opts->ext_copy.use_map =1 ; - opts->ext_copy.dsn64 = mpext->dsn64; - } +if (mpext) + opts->ext_copy = *mpext; }else { opts->ext_copy.use_map =0 ;WARN_ONCE (1 ,"MPTCP: Map dropped" );Signature · 4 lines
2.21.0 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
Matthieu Baerts
Hi Florian, Mat,
Quoted 7 lines · Mat Martineau
Quoted 2 lines · Florian Westphal
No reason to copy each member individually, just copy everything. This means we will also copy
ext->data_finwhich was not done before.Looks good to me. I think the missing
data_fincopy was a bug.
Thank you for the patch -- good catch -- and the review!
- e00602aa68b2: "squashed" in "mptcp: Write MPTCP DSS headers to outgoing data packets"
- already has signed-off
- 2f9e62154e58..94fbc140ae04: result
Cheers,
Matt
Signature · 5 lines
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