diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2021-02-03 16:54:22 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-02-04 18:37:14 -0800 |
| commit | a4a600dd301ccde6ea239804ec1f19364a39d643 (patch) | |
| tree | 1396cb0f8068668fd434675766751b17fee6bd73 /net/ipv6/udp.c | |
| parent | net-loopback: set lo dev initial state to UP (diff) | |
| download | linux-dev-a4a600dd301ccde6ea239804ec1f19364a39d643.tar.xz linux-dev-a4a600dd301ccde6ea239804ec1f19364a39d643.zip | |
udp: call udp_encap_enable for v6 sockets when enabling encap
When enabling encap for a ipv6 socket without udp_encap_needed_key
increased, UDP GRO won't work for v4 mapped v6 address packets as
sk will be NULL in udp4_gro_receive().
This patch is to enable it by increasing udp_encap_needed_key for
v6 sockets in udp_tunnel_encap_enable(), and correspondingly
decrease udp_encap_needed_key in udpv6_destroy_sock().
v1->v2:
- add udp_encap_disable() and export it.
v2->v3:
- add the change for rxrpc and bareudp into one patch, as Alex
suggested.
v3->v4:
- move rxrpc part to another patch.
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index b9f3dfdd2383..d75429205084 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1608,8 +1608,10 @@ void udpv6_destroy_sock(struct sock *sk) if (encap_destroy) encap_destroy(sk); } - if (up->encap_enabled) + if (up->encap_enabled) { static_branch_dec(&udpv6_encap_needed_key); + udp_encap_disable(); + } } inet6_destroy_sock(sk); |