diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-28 20:43:58 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-28 20:43:58 +0300 |
| commit | 7df621a3eea6761bc83e641aaca6963210c7290d (patch) | |
| tree | 65ab9d0d1894153ceefcb6b5a1c25b8d17c466fd /include/net/mptcp.h | |
| parent | f2edaa4ad5d51371709196f2c258fbe875962dee (diff) | |
| parent | 411a44c24a561e449b592ff631b7ae321f1eb559 (diff) | |
| download | linux-7df621a3eea6761bc83e641aaca6963210c7290d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
7b50ecfcc6cd ("net: Rename ->stream_memory_read to ->sock_is_readable")
4c1e34c0dbff ("vsock: Enable y2038 safe timeval for timeout")
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
0daa55d033b0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
e77bcdd1f639 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")
Adjacent code addition in both cases, keep both.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/mptcp.h')
| -rw-r--r-- | include/net/mptcp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index f83fa48408b3..a925349b4b89 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -71,6 +71,10 @@ struct mptcp_out_options { struct { u64 sndr_key; u64 rcvr_key; + u64 data_seq; + u32 subflow_seq; + u16 data_len; + __sum16 csum; }; struct { struct mptcp_addr_info addr; |