2021-09-01 02:49:54

by Jiabing Wan

Subject: [PATCH] mptcp: Fix duplicated argument in protocol.h

./net/mptcp/protocol.h:36:50-73: duplicated argument to & or |

The OPTION_MPTCP_MPJ_SYNACK here is duplicate.
Here should be OPTION_MPTCP_MPJ_ACK.

Signed-off-by: Wan Jiabing <[email protected]>
---
net/mptcp/protocol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index d7aba1c4dc48..64c9a30e0871 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -34,7 +34,7 @@
#define OPTIONS_MPTCP_MPC (OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | \
OPTION_MPTCP_MPC_ACK)
#define OPTIONS_MPTCP_MPJ (OPTION_MPTCP_MPJ_SYN | OPTION_MPTCP_MPJ_SYNACK | \
- OPTION_MPTCP_MPJ_SYNACK)
+ OPTION_MPTCP_MPJ_ACK)

/* MPTCP option subtypes */
#define MPTCPOPT_MP_CAPABLE 0
--
2.25.1

2021-09-01 02:59:03

by Geliang Tang

Subject: Re: [PATCH] mptcp: Fix duplicated argument in protocol.h

Hi Jiabing,

Wan Jiabing <[email protected]> 于2021年9月1日周三 上午10:40写道：
>
> ./net/mptcp/protocol.h:36:50-73: duplicated argument to & or |
>
> The OPTION_MPTCP_MPJ_SYNACK here is duplicate.
> Here should be OPTION_MPTCP_MPJ_ACK.
>

Good catch!

Acked-by: Geliang Tang <[email protected]>

Please add a Fixes-tag here in v2 like this:

Fixes: 74c7dfbee3e18 ("mptcp: consolidate in_opt sub-options fields in
a bitmask")

Thanks,
-Geliang

> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> net/mptcp/protocol.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index d7aba1c4dc48..64c9a30e0871 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -34,7 +34,7 @@
> #define OPTIONS_MPTCP_MPC (OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | \
> OPTION_MPTCP_MPC_ACK)
> #define OPTIONS_MPTCP_MPJ (OPTION_MPTCP_MPJ_SYN | OPTION_MPTCP_MPJ_SYNACK | \
> - OPTION_MPTCP_MPJ_SYNACK)
> + OPTION_MPTCP_MPJ_ACK)
>
> /* MPTCP option subtypes */
> #define MPTCPOPT_MP_CAPABLE 0
> --
> 2.25.1
>
>