| Message ID | 20210901023205.5049-1-wanjiabing@vivo.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | mptcp: Fix duplicated argument in protocol.h | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 6 this patch: 6 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 6 this patch: 6 |
| netdev/header_inline | success | Link |
Hi Jiabing, Wan Jiabing <wanjiabing@vivo.com> 于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 <geliangtang@gmail.com> 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 <wanjiabing@vivo.com> > --- > 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 > >
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
./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 <wanjiabing@vivo.com> --- net/mptcp/protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)