v2: - Patch 1, avoid changing __mptcp_subflow_connect's parameter, use container_of to get the entry. - No change in patches 2-7. The patch set refactored struct mptcp_addr_info, and use it in both mptcp_out_options and mptcp_out_options. Then drop the duplicate code and do cleanups. Geliang Tang (7): mptcp: move ifindex and flags out of mptcp_addr_info mptcp: use mptcp_addr_info in mptcp_out_options mptcp: use mptcp_addr_info in mptcp_options_received mptcp: drop MPTCP_ADDR_IPVERSION_4/6 mptcp: unify add_addr(6)_generate_hmac mptcp: drop OPTION_MPTCP_ADD_ADDR6 mptcp: drop unnecessary CONFIG_MPTCP_IPV6 include/net/mptcp.h | 21 +++-- net/mptcp/options.c | 175 +++++++++++++---------------------------- net/mptcp/pm_netlink.c | 55 +++++-------- net/mptcp/protocol.h | 36 +++------ net/mptcp/subflow.c | 6 +- 5 files changed, 104 insertions(+), 189 deletions(-) -- 2.30.2