OSDN Git Service

Merge branch 'mptcp-don-t-auto-adjust-rcvbuf-size-if-locked'
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2020 02:30:08 +0000 (19:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2020 02:30:08 +0000 (19:30 -0700)
commitc8e98343bf5c322026324d6ef9d8ac891ad19dc4
treeaa2e8d86f05c74838a972a71afbb8349856894db
parent37feab6076aa816ed72fe836759a485353241916
parentec33916d47cbac546e0437b59e6ed779d3c31ac3
Merge branch 'mptcp-don-t-auto-adjust-rcvbuf-size-if-locked'

Florian Westphal says:

====================
mptcp: don't auto-adjust rcvbuf size if locked

The mptcp receive buffer is auto-sized based on the subflow receive
buffer.  Don't do this if userspace specfied a value via SO_RCVBUF
setsockopt.

Also update selftest program to provide a new option to set a fixed
size.
====================

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