From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Mar 2020 02:30:08 +0000 (-0700)
Subject: Merge branch 'mptcp-don-t-auto-adjust-rcvbuf-size-if-locked'
X-Git-Tag: v5.7-rc1~146^2~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8e98343bf5c322026324d6ef9d8ac891ad19dc4;p=thirdparty%2Flinux.git

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>
---

c8e98343bf5c322026324d6ef9d8ac891ad19dc4