From: David S. Miller Date: Fri, 4 Jun 2021 21:08:09 +0000 (-0700) Subject: Merge branch 'mptcp-timestamps' X-Git-Tag: microblaze-v5.15~120^2~339 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d15fd7359ab18a46c5fefc36be45b36205f1acfc;p=linux-2.6-microblaze.git Merge branch 'mptcp-timestamps' Mat Martineau says: ==================== mptcp: Add timestamp support Enable the SO_TIMESTAMP and SO_TIMESTAMPING socket options for MPTCP sockets and add receive path cmsg support for timestamps. Patches 1, 2, and 5 expose existing sock and tcp helpers for timestamps (no new EXPORT_SYMBOLS()s). Patch 3 propagates timestamp options to subflows. Patch 4 cleans up MPTCP handling of SOL_SOCKET options. Patch 6 adds timestamp csmg data when receiving on sockets that have been configured for timestamps. Patch 7 adds self test coverage for timestamps. ==================== Signed-off-by: David S. Miller --- d15fd7359ab18a46c5fefc36be45b36205f1acfc