Commit 5d30c626 authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

rxrpc: call udp_tunnel_encap_enable in rxrpc_open_socket 



When doing encap_enable/increasing encap_needed_key, up->encap_enabled
is not set in rxrpc_open_socket(), and it will cause encap_needed_key
not being decreased in udpv6_destroy_sock().

This patch is to improve it by just calling udp_tunnel_encap_enable()
where it increases both UDP and UDPv6 encap_needed_key and sets
up->encap_enabled.

v4->v5:
  - add the missing '#include <net/udp_tunnel.h>', as David Howells
    noticed.

Acked-and-tested-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a4a600dd

net/rxrpc/local_object.c

+2 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/hashtable.h>

#include <net/sock.h>

#include <net/udp.h>

#include <net/udp_tunnel.h>

#include <net/af_rxrpc.h>

#include "ar-internal.h"
@@ -135,11 +136,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net) 
	udp_sk(usk)->gro_receive = NULL;

	udp_sk(usk)->gro_complete = NULL;



	udp_encap_enable();

#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6)

	if (local->srx.transport.family == AF_INET6)

		udpv6_encap_enable();

#endif

	udp_tunnel_encap_enable(local->socket);

	usk->sk_error_report = rxrpc_error_report;



	/* if a local address was supplied then bind it */