| Message ID | f3808e3bfccf51a4a41e8ff3c793a464d8c3ae61.1620349748.git.geliangtang@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 079024ea23939cccade8e1023d52c4925a8d9d48 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" | expand |
On Fri, 7 May 2021, Geliang Tang wrote: > Keep mptcp_parse_option unchanged. > > Please update the commit log too: > > ''' > mptcp: add sk parameter for mptcp_get_options > > This patch added a new parameter name sk in mptcp_get_options(). > ''' > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/options.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > Looks good to me, thanks Geliang. -Mat > diff --git a/net/mptcp/options.c b/net/mptcp/options.c > index 8f768c517586..1d360639ca91 100644 > --- a/net/mptcp/options.c > +++ b/net/mptcp/options.c > @@ -20,8 +20,7 @@ static bool mptcp_cap_flag_sha256(u8 flags) > return (flags & MPTCP_CAP_FLAG_MASK) == MPTCP_CAP_HMAC_SHA256; > } > > -static void mptcp_parse_option(const struct sock *sk, > - const struct sk_buff *skb, > +static void mptcp_parse_option(const struct sk_buff *skb, > const unsigned char *ptr, int opsize, > struct mptcp_options_received *mp_opt) > { > @@ -365,7 +364,7 @@ void mptcp_get_options(const struct sock *sk, > if (opsize > length) > return; /* don't parse partial options */ > if (opcode == TCPOPT_MPTCP) > - mptcp_parse_option(sk, skb, ptr, opsize, mp_opt); > + mptcp_parse_option(skb, ptr, opsize, mp_opt); > ptr += opsize - 2; > length -= opsize; > } > -- > 2.31.1 > > > -- Mat Martineau Intel
Hi Geliang, Mat, On 07/05/2021 03:12, Geliang Tang wrote: > Keep mptcp_parse_option unchanged. > > Please update the commit log too: > > ''' > mptcp: add sk parameter for mptcp_get_options > > This patch added a new parameter name sk in mptcp_get_options(). > ''' > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> Thank you for the patch! Now in our tree: - 079024ea2393: "squashed" in "mptcp: add sk parameter for mptcp_parse_option" - 31116dbd2a19: tg:msg: remove mptcp_parse_option - Results: 0ebe24033a1a..bcf6675a2d3f Builds and tests are now in progress: https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210513T072854 https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210513T072854 Cheers, Mat
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 8f768c517586..1d360639ca91 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -20,8 +20,7 @@ static bool mptcp_cap_flag_sha256(u8 flags) return (flags & MPTCP_CAP_FLAG_MASK) == MPTCP_CAP_HMAC_SHA256; } -static void mptcp_parse_option(const struct sock *sk, - const struct sk_buff *skb, +static void mptcp_parse_option(const struct sk_buff *skb, const unsigned char *ptr, int opsize, struct mptcp_options_received *mp_opt) { @@ -365,7 +364,7 @@ void mptcp_get_options(const struct sock *sk, if (opsize > length) return; /* don't parse partial options */ if (opcode == TCPOPT_MPTCP) - mptcp_parse_option(sk, skb, ptr, opsize, mp_opt); + mptcp_parse_option(skb, ptr, opsize, mp_opt); ptr += opsize - 2; length -= opsize; }
Keep mptcp_parse_option unchanged. Please update the commit log too: ''' mptcp: add sk parameter for mptcp_get_options This patch added a new parameter name sk in mptcp_get_options(). ''' Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)