From: Jakub Kicinski Date: Fri, 5 Feb 2021 02:37:18 +0000 (-0800) Subject: Merge branch 'net-enable-udp-v6-sockets-receiving-v4-packets-with-udp' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ccdafd226345f19343e97662f12047dd706046a0;p=uclinux-h8%2Flinux.git Merge branch 'net-enable-udp-v6-sockets-receiving-v4-packets-with-udp' Xin Long says: ==================== net: enable udp v6 sockets receiving v4 packets with UDP Currently, udp v6 socket can not process v4 packets with UDP GRO, as udp_encap_needed_key is not increased when udp_tunnel_encap_enable() is called for v6 socket. This patchset is to increase it and remove the unnecessary code in bareudp in Patch 1/2, and improve rxrpc encap_enable by calling udp_tunnel_encap_enable(). ==================== Link: https://lore.kernel.org/r/cover.1612342376.git.lucien.xin@gmail.com Signed-off-by: Jakub Kicinski --- ccdafd226345f19343e97662f12047dd706046a0