| 1 | The commit 1bb0d1348546 ("mptcp: pm: only set fullmesh for subflow endp") | 1 | The commit 1bb0d1348546 ("mptcp: pm: only set fullmesh for subflow endp") |
|---|---|---|---|
| 2 | could not be backported to this kernel version without conflicts. Here | 2 | could not be backported to this kernel version without conflicts. Here |
| 3 | is an updated version adapted for this kernel version. | 3 | is an updated version adapted for this kernel version. |
| 4 | 4 | ||
| 5 | While at it, I also added the backport of the commit 56b824eb49d6 | 5 | While at it, I also added the backport of the commit 56b824eb49d6 |
| 6 | ("mptcp: prevent excessive coalescing on receive") that we asked to | 6 | ("mptcp: prevent excessive coalescing on receive") that we asked to |
| 7 | delay. There was no conflicts. | 7 | delay. There were no conflicts. |
| 8 | 8 | ||
| 9 | There is also an additional fix for the selftests, specific to v6.6. | 9 | Matthieu Baerts (NGI0) (1): |
| 10 | |||
| 11 | Matthieu Baerts (NGI0) (2): | ||
| 12 | mptcp: pm: only set fullmesh for subflow endp | 10 | mptcp: pm: only set fullmesh for subflow endp |
| 13 | selftests: mptcp: join: fix AF_INET6 variable | ||
| 14 | 11 | ||
| 15 | Paolo Abeni (1): | 12 | Paolo Abeni (1): |
| 16 | mptcp: prevent excessive coalescing on receive | 13 | mptcp: prevent excessive coalescing on receive |
| 17 | 14 | ||
| 18 | net/mptcp/pm_netlink.c | 3 ++- | 15 | net/mptcp/pm_netlink.c | 3 ++- |
| 19 | net/mptcp/protocol.c | 1 + | 16 | net/mptcp/protocol.c | 1 + |
| 20 | tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- | 17 | 2 files changed, 3 insertions(+), 1 deletion(-) |
| 21 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
| 22 | 18 | ||
| 23 | -- | 19 | -- |
| 24 | 2.47.1 | 20 | 2.47.1 | diff view generated by jsdifflib |