Messages in this thread | | | Date | Thu, 30 Jan 2020 15:41:23 +0100 (CET) | Subject | [GIT] Networking | From | David Miller <> |
| |
1) Various mptcp fixupes from Florian Westphal and Geery Uytterhoeven.
2) Don't clear the node/port GUIDs after we've assigned the correct values to them. From Leon Romanovsky.
Please pull, thanks a lot!
The following changes since commit b3a6082223369203d7e7db7e81253ac761377644:
Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security (2020-01-28 18:55:17 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
for you to fetch changes up to 9fbf082f569980ddd7cab348e0a118678db0e47e:
net/core: Do not clear VF index for node/port GUIDs query (2020-01-30 15:20:26 +0100)
---------------------------------------------------------------- David S. Miller (2): mptcp: Fix build with PROC_FS disabled. Merge branch 'mptcp-fix-sockopt-crash-and-lockdep-splats'
Florian Westphal (4): mptcp: defer freeing of cached ext until last moment mptcp: fix panic on user pointer access mptcp: avoid a lockdep splat when mcast group was joined mptcp: handle tcp fallback when using syn cookies
Geert Uytterhoeven (3): mptcp: Fix incorrect IPV6 dependency check mptcp: MPTCP_HMAC_TEST should depend on MPTCP mptcp: Fix undefined mptcp_handle_ipv6_mapped for modular IPV6
Joe Perches (2): sch_choke: Use kvcalloc net: drop_monitor: Use kstrdup
Leon Romanovsky (1): net/core: Do not clear VF index for node/port GUIDs query
Lorenzo Bianconi (1): net: mvneta: fix XDP support if sw bm is used as fallback
Mat Martineau (1): Revert "MAINTAINERS: mptcp@ mailing list is moderated"
Randy Dunlap (1): MAINTAINERS: mptcp@ mailing list is moderated
Willem de Bruijn (1): udp: document udp_rcv_segment special case for looped packets
drivers/net/ethernet/marvell/mvneta.c | 10 +++++++--- include/linux/tcp.h | 2 -- include/net/mptcp.h | 9 +++------ include/net/udp.h | 7 +++++++ net/core/drop_monitor.c | 8 ++------ net/core/rtnetlink.c | 4 ++-- net/ipv4/syncookies.c | 4 ++++ net/ipv4/tcp_input.c | 3 +++ net/ipv6/syncookies.c | 3 +++ net/ipv6/tcp_ipv6.c | 6 +++--- net/mptcp/Kconfig | 6 ++++-- net/mptcp/protocol.c | 56 +++++++++++++++++++++++++++++++++----------------------- net/mptcp/subflow.c | 13 +++++++++---- net/sched/sch_choke.c | 2 +- 14 files changed, 81 insertions(+), 52 deletions(-)
| |