[net-next,0/7] mptcp: Miscellaneous cleanup

Message

Mat Martineau May 27, 2021, 11:54 p.m. UTC

Here are some cleanup patches we've collected in the MPTCP tree.

Patches 1-4 do some general tidying.

Patch 5 adds an explicit check at netlink command parsing time to
require a port number when the 'signal' flag is set, to catch the error
earlier.

Patches 6 & 7 fix up the MPTCP 'enabled' sysctl, enforcing it as a
boolean value, and ensuring that the !CONFIG_SYSCTL build still works
after the boolean change.

Jianguo Wu (5):
  mptcp: fix pr_debug in mptcp_token_new_connect
  mptcp: using TOKEN_MAX_RETRIES instead of magic number
  mptcp: generate subflow hmac after mptcp_finish_join()
  mptcp: remove redundant initialization in pm_nl_init_net()
  mptcp: make sure flag signal is set when add addr with port

Matthieu Baerts (2):
  mptcp: support SYSCTL only if enabled
  mptcp: restrict values of 'enabled' sysctl

 Documentation/networking/mptcp-sysctl.rst |  8 ++---
 net/mptcp/ctrl.c                          | 36 +++++++++++++++++------
 net/mptcp/pm_netlink.c                    | 15 ++++++++--
 net/mptcp/protocol.h                      |  2 ++
 net/mptcp/subflow.c                       |  8 ++---
 net/mptcp/token.c                         |  9 +++---
 6 files changed, 53 insertions(+), 25 deletions(-)


base-commit: 91b17a436759e9f3a6f9ff090693564c3299cd9a

Comments

Jakub Kicinski May 28, 2021, 9:07 p.m. UTC | #1

On Thu, 27 May 2021 16:54:23 -0700 Mat Martineau wrote:
> Here are some cleanup patches we've collected in the MPTCP tree.
> 
> Patches 1-4 do some general tidying.
> 
> Patch 5 adds an explicit check at netlink command parsing time to
> require a port number when the 'signal' flag is set, to catch the error
> earlier.
> 
> Patches 6 & 7 fix up the MPTCP 'enabled' sysctl, enforcing it as a
> boolean value, and ensuring that the !CONFIG_SYSCTL build still works
> after the boolean change.

Pulled, thanks!

Would you mind making sure that all maintainers and authors of commits
pointed to by Fixes tags are always CCed? I assume that those folks
usually see the patches on mptcp@ ML before they hit netdev but I'd
rather not have to assume..

Mat Martineau June 1, 2021, 5:21 p.m. UTC | #2

On Fri, 28 May 2021, Jakub Kicinski wrote:

> On Thu, 27 May 2021 16:54:23 -0700 Mat Martineau wrote:
>> Here are some cleanup patches we've collected in the MPTCP tree.
>>
>> Patches 1-4 do some general tidying.
>>
>> Patch 5 adds an explicit check at netlink command parsing time to
>> require a port number when the 'signal' flag is set, to catch the error
>> earlier.
>>
>> Patches 6 & 7 fix up the MPTCP 'enabled' sysctl, enforcing it as a
>> boolean value, and ensuring that the !CONFIG_SYSCTL build still works
>> after the boolean change.
>
> Pulled, thanks!
>
> Would you mind making sure that all maintainers and authors of commits
> pointed to by Fixes tags are always CCed? I assume that those folks
> usually see the patches on mptcp@ ML before they hit netdev but I'd
> rather not have to assume..

No problem at all, I will add get_maintainers.pl to my checklist and add 
Cc: tags to future patch sets.

--
Mat Martineau
Intel