diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-12-12 13:11:25 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-12 13:11:26 -0800 |
| commit | a38a211e9e0ca20f5d65307c98571f40f78ad396 (patch) | |
| tree | a5a5b8d53a1b1e1ef3ec040eb59d5142d5ccc2b1 /include | |
| parent | 84698dad0641ffdb7273f3b31664ce32a2e1386c (diff) | |
| parent | d3295fee3c756ece33ac0d935e172e68c0a4161b (diff) | |
Merge branch 'mptcp-fix-ipv6-reqsk-ops-and-some-netlink-error-codes'
Mat Martineau says:
====================
mptcp: Fix IPv6 reqsk ops and some netlink error codes
Patch 1 adds some missing error status values for MPTCP path management
netlink commands with invalid attributes.
Patches 2-4 make IPv6 subflows use the correct request_sock_ops
structure and IPv6-specific destructor. The first patch in this group is
a prerequisite change that simplifies the last two patches.
====================
Link: https://lore.kernel.org/r/20221210002810.289674-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mptcp.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 412479ebf5ad..3c5c68618fcc 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -97,8 +97,6 @@ struct mptcp_out_options { }; #ifdef CONFIG_MPTCP -extern struct request_sock_ops mptcp_subflow_request_sock_ops; - void mptcp_init(void); static inline bool sk_is_mptcp(const struct sock *sk) @@ -188,6 +186,9 @@ void mptcp_seq_show(struct seq_file *seq); int mptcp_subflow_init_cookie_req(struct request_sock *req, const struct sock *sk_listener, struct sk_buff *skb); +struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops, + struct sock *sk_listener, + bool attach_listener); __be32 mptcp_get_reset_option(const struct sk_buff *skb); @@ -274,6 +275,13 @@ static inline int mptcp_subflow_init_cookie_req(struct request_sock *req, return 0; /* TCP fallback */ } +static inline struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops, + struct sock *sk_listener, + bool attach_listener) +{ + return NULL; +} + static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { return htonl(0u); } #endif /* CONFIG_MPTCP */ |