Merge branch 'mptcp-Connection-and-accounting-fixes'
Mat Martineau says:
====================
mptcp: Connection and accounting fixes
Here are some miscellaneous fixes for MPTCP:
Patch 1 modifies an MPTCP hash so it doesn't depend on one of skb->dev
and skb->sk being non-NULL.
Patch 2 removes an extra destructor call when rejecting a join due to
port mismatch.
Patches 3 and 5 more cleanly handle error conditions with MP_JOIN and
syncookies, and update a related self test.
Patch 4 makes sure packets that trigger a subflow TCP reset during MPTCP
option header processing are correctly dropped.
Patch 6 addresses a rmem accounting issue that could keep packets in
subflow receive buffers longer than necessary, delaying MPTCP-level
ACKs.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/net/mptcp.h 3 additions, 2 deletionsinclude/net/mptcp.h
- net/ipv4/tcp_input.c 15 additions, 4 deletionsnet/ipv4/tcp_input.c
- net/mptcp/mib.c 1 addition, 0 deletionsnet/mptcp/mib.c
- net/mptcp/mib.h 1 addition, 0 deletionsnet/mptcp/mib.h
- net/mptcp/options.c 13 additions, 6 deletionsnet/mptcp/options.c
- net/mptcp/protocol.c 7 additions, 5 deletionsnet/mptcp/protocol.c
- net/mptcp/protocol.h 9 additions, 1 deletionnet/mptcp/protocol.h
- net/mptcp/subflow.c 3 additions, 8 deletionsnet/mptcp/subflow.c
- net/mptcp/syncookies.c 15 additions, 1 deletionnet/mptcp/syncookies.c
- tools/testing/selftests/net/mptcp/mptcp_join.sh 1 addition, 1 deletiontools/testing/selftests/net/mptcp/mptcp_join.sh
Please register or sign in to comment