From: David S. Miller Date: Fri, 28 Feb 2020 20:13:02 +0000 (-0800) Subject: Merge branch 'net-cleanup-datagram-receive-helpers' X-Git-Tag: v5.15~4200^2~288 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9a834f9b04bc5ed2db27eb45b0cc6415ce7c314c;p=mirror_ubuntu-kernels.git Merge branch 'net-cleanup-datagram-receive-helpers' Paolo Abeni says: ==================== net: cleanup datagram receive helpers Several receive helpers have an optional destructor argument, which uglify the code a bit and is taxed by retpoline overhead. This series refactor the code so that we can drop such optional argument, cleaning the helpers a bit and avoiding an indirect call in fast path. The first patch refactor a bit the caller, so that the second patch actually dropping the argument is more straight-forward v1 -> v2: - call scm_stat_del() only when not peeking - Kirill - fix build issue with CONFIG_INET_ESPINTCP ==================== Signed-off-by: David S. Miller --- 9a834f9b04bc5ed2db27eb45b0cc6415ce7c314c