From: Taehee Yoo <ap420073@gmail.com>
Date: Sun, 8 Mar 2020 01:19:30 +0000 (+0000)
Subject: bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create()
X-Git-Tag: v5.7-rc1~146^2~228^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2baecda;p=thirdparty%2Flinux.git

bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create()

In the current code, udp_encap_enable() is called in
bareudp_socket_create().
But, setup_udp_tunnel_sock() internally calls udp_encap_enable().
So, udp_encap_enable() is unnecessary.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index c9d0d68467f77..71a2f480f70e0 100644
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -250,9 +250,6 @@ static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port)
 	tunnel_cfg.encap_destroy = NULL;
 	setup_udp_tunnel_sock(bareudp->net, sock, &tunnel_cfg);
 
-	if (sock->sk->sk_family == AF_INET6)
-		udp_encap_enable();
-
 	rcu_assign_pointer(bareudp->sock, sock);
 	return 0;
 }