Merge branch 'mptcp-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sat, 16 Oct 2021 07:46:08 +0000 (08:46 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 Oct 2021 07:46:08 +0000 (08:46 +0100)
commitdcebeb8bfedcdf9d5964df1d7db3d3c55a321257
treeee2013c45613bdcb9b7fd8df693f0d07b110329d
parent295711fa8fec42a55623bf6997d05a21d7855132
parent3828c514726fce7d97063155c4749eafefd9fbd2
Merge branch 'mptcp-fixes'

Mat Martineau says:

====================
mptcp: A few fixes

This set has three separate changes for the net-next tree:

Patch 1 guarantees safe handling and a warning if a NULL value is
encountered when gathering subflow data for the MPTCP_SUBFLOW_ADDRS
socket option.

Patch 2 increases the default number of subflows allowed per MPTCP
connection.

Patch 3 makes an existing function 'static'.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>