diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-06 22:10:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-06 22:10:13 -0700 |
| commit | 3793faad7b5b730941b2efbc252d14374b60843a (patch) | |
| tree | e1bea43727d87f8fd30ca169f465a3591f15d63b /include/net/mptcp.h | |
| parent | dsa: sja1105: dynamically allocate stats structure (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-3793faad7b5b730941b2efbc252d14374b60843a.tar.xz linux-dev-3793faad7b5b730941b2efbc252d14374b60843a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts were all overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/mptcp.h')
| -rw-r--r-- | include/net/mptcp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 5288fba56e55..e60275659de6 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -69,12 +69,8 @@ static inline bool rsk_is_mptcp(const struct request_sock *req) } void mptcp_space(const struct sock *ssk, int *space, int *full_space); - -void mptcp_parse_option(const struct sk_buff *skb, const unsigned char *ptr, - int opsize, struct tcp_options_received *opt_rx); bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb, unsigned int *size, struct mptcp_out_options *opts); -void mptcp_rcv_synsent(struct sock *sk); bool mptcp_synack_options(const struct request_sock *req, unsigned int *size, struct mptcp_out_options *opts); bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, |