diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-12-14 17:30:08 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-14 17:30:09 -0800 |
| commit | ebf322822cc93259316480266afeb889dd65522a (patch) | |
| tree | 32ff1828e3dc23a2dadba291d8ad3ba41f131722 /include | |
| parent | efc36d3c344a36fe73cda93c55763058629e0f2c (diff) | |
| parent | 15e6ca974b14c2dc4221738ef81b23ef694c9160 (diff) | |
| download | cachepc-linux-ebf322822cc93259316480266afeb889dd65522a.tar.gz cachepc-linux-ebf322822cc93259316480266afeb889dd65522a.zip | |
Merge branch 'mptcp-another-set-of-miscellaneous-mptcp-fixes'
Mat Martineau says:
====================
mptcp: Another set of miscellaneous MPTCP fixes
This is another collection of MPTCP fixes and enhancements that we have
tested in the MPTCP tree:
Patch 1 cleans up cgroup attachment for in-kernel subflow sockets.
Patches 2 and 3 make sure that deletion of advertised addresses by an
MPTCP path manager when flushing all addresses behaves similarly to the
remove-single-address operation, and adds related tests.
Patches 4 and 8 do some minor cleanup.
Patches 5-7 add MPTCP_FASTCLOSE functionality. Note that patch 6 adds MPTCP
option parsing to tcp_reset().
Patch 9 optimizes skb size for outgoing MPTCP packets.
====================
Link: https://lore.kernel.org/r/20201210222506.222251-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a62fb7f8a1e3..b1a05f8b35f0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -611,7 +611,7 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb, /* tcp_input.c */ void tcp_rearm_rto(struct sock *sk); void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req); -void tcp_reset(struct sock *sk); +void tcp_reset(struct sock *sk, struct sk_buff *skb); void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb); void tcp_fin(struct sock *sk); |