diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-02-04 18:37:18 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-04 18:37:18 -0800 |
| commit | ccdafd226345f19343e97662f12047dd706046a0 (patch) | |
| tree | ddea15539e696d53fc418d3d115b662d29d1cd0f /net/ipv4/udp.c | |
| parent | c9dca822c72914ff33593b12f9fb229f0c0afd47 (diff) | |
| parent | 5d30c626b67e1c70ba7805d468c7de39f1da2f7e (diff) | |
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 <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 69ea76578abb..48208fb4e895 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -596,6 +596,12 @@ void udp_encap_enable(void) } EXPORT_SYMBOL(udp_encap_enable); +void udp_encap_disable(void) +{ + static_branch_dec(&udp_encap_needed_key); +} +EXPORT_SYMBOL(udp_encap_disable); + /* Handler for tunnels with arbitrary destination ports: no socket lookup, go * through error handlers in encapsulations looking for a match. */ |