From: Taehee Yoo Date: Sun, 8 Mar 2020 01:19:30 +0000 (+0000) Subject: bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create() X-Git-Tag: microblaze-v5.10~1137^2~228^2 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2baecda37f4ef4414be15452a333fe4fd13c0df3;p=linux-2.6-microblaze.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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index c9d0d68467f7..71a2f480f70e 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; }