xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse Source 
Conflicts were all overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2020-05-06 22:10:13 -07:00
parent ae1804de93 a811c1fa0a
commit 3793faad7b
408 changed files with 3574 additions and 1837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/mptcp.h
View File

@@ -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,